Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Unified Diff: ash/system/chromeos/brightness/tray_brightness.cc

Issue 308683002: Move MaximizeModeWindowManager to the controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.cc ('k') | ash/system/chromeos/brightness/tray_brightness_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
+
#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());
}
}
« no previous file with comments | « ash/shell.cc ('k') | ash/system/chromeos/brightness/tray_brightness_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698