Chromium Code Reviews| Index: ash/system/chromeos/brightness/tray_brightness.cc |
| diff --git a/ash/system/chromeos/brightness/tray_brightness.cc b/ash/system/chromeos/brightness/tray_brightness.cc |
| index 901b0aa2a3a4380239c56319a8e1303cae1530f9..ee511ea97f67a877dd8898e25cbb63eea19bee56 100644 |
| --- a/ash/system/chromeos/brightness/tray_brightness.cc |
| +++ b/ash/system/chromeos/brightness/tray_brightness.cc |
| @@ -4,6 +4,8 @@ |
| #include "ash/system/chromeos/brightness/tray_brightness.h" |
| +#include <algorithm> |
| + |
|
jonross
2014/05/29 15:24:42
cpplint
|
| #include "ash/accelerators/accelerator_controller.h" |
| #include "ash/ash_constants.h" |
| #include "ash/display/display_manager.h" |
| @@ -15,6 +17,7 @@ |
| #include "ash/system/tray/system_tray_delegate.h" |
| #include "ash/system/tray/system_tray_notifier.h" |
| #include "ash/system/tray/tray_constants.h" |
| +#include "ash/wm/maximize_mode/maximize_mode_controller.h" |
| #include "base/bind.h" |
| #include "base/message_loop/message_loop.h" |
| #include "base/strings/utf_string_conversions.h" |
| @@ -113,7 +116,8 @@ BrightnessView::BrightnessView(bool default_view, double initial_percent) |
| if (is_default_view_) { |
| Shell::GetInstance()->AddShellObserver(this); |
| - SetVisible(Shell::GetInstance()->IsMaximizeModeWindowManagerEnabled()); |
| + SetVisible(Shell::GetInstance()->maximize_mode_controller()-> |
| + IsMaximizeModeWindowManagerEnabled()); |
|
flackr
2014/05/29 16:10:06
nit: indent 4 more to show it's wrapped from above
jonross
2014/05/29 17:40:00
Done.
|
| } |
| } |