Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
diff --git a/ash/shell.h b/ash/shell.h
index 1518ea6..14e1f91 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -326,12 +326,6 @@
void AddShellObserver(ShellObserver* observer);
void RemoveShellObserver(ShellObserver* observer);
- // Turn the always maximize mode window manager on or off.
- void EnableMaximizeModeWindowManager(bool enable);
-
- // Test if the MaximizeModeWindowManager is enabled or not.
- bool IsMaximizeModeWindowManagerEnabled();
-
#if defined(OS_CHROMEOS)
// Test if MaximizeModeWindowManager is not enabled, and if
// MaximizeModeController is not currently setting a display rotation. Or if
@@ -457,7 +451,7 @@
// Sets/gets shelf's alignment on |root_window|.
void SetShelfAlignment(ShelfAlignment alignment,
aura::Window* root_window);
- ShelfAlignment GetShelfAlignment(aura::Window* root_window);
+ ShelfAlignment GetShelfAlignment(const aura::Window* root_window);
// Dims or undims the screen.
void SetDimming(bool should_dim);
@@ -704,9 +698,6 @@
scoped_ptr<LocaleNotificationController> locale_notification_controller_;
- // The maximized window manager (if enabled).
- scoped_ptr<MaximizeModeWindowManager> maximize_mode_window_manager_;
-
scoped_ptr<AccelerometerController> accelerometer_controller_;
#if defined(OS_CHROMEOS)