Chromium Code Reviews| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
| index fd384118f314b079470ee25146b7bd3419fb1abc..6619028f6d624e930d935e80f3ff86b1b922c2e6 100644 |
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
| @@ -4,6 +4,7 @@ |
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
| +#include <algorithm> |
|
jonross
2014/05/29 15:24:42
cpplint
|
| #include <vector> |
| #include "ash/ash_switches.h" |
| @@ -17,6 +18,7 @@ |
| #include "ash/shelf/shelf_widget.h" |
| #include "ash/shell.h" |
| #include "ash/system/tray/system_tray_delegate.h" |
| +#include "ash/wm/maximize_mode/maximize_mode_controller.h" |
| #include "ash/wm/window_util.h" |
| #include "base/command_line.h" |
| #include "base/prefs/scoped_user_pref_update.h" |
| @@ -907,7 +909,8 @@ ash::ShelfAutoHideBehavior ChromeLauncherController::GetShelfAutoHideBehavior( |
| bool ChromeLauncherController::CanUserModifyShelfAutoHideBehavior( |
| aura::Window* root_window) const { |
| - return !ash::Shell::GetInstance()->IsMaximizeModeWindowManagerEnabled() && |
| + return !ash::Shell::GetInstance()->maximize_mode_controller()-> |
| + IsMaximizeModeWindowManagerEnabled() && |
| profile_->GetPrefs()->FindPreference( |
| prefs::kShelfAutoHideBehaviorLocal)->IsUserModifiable(); |
| } |