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

Unified Diff: ash/wm/maximize_mode/maximize_mode_controller.h

Issue 437213005: Fixing problem with the maximize mode where MultiProfile windows do not get properly handled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 6 years, 4 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 | « no previous file | ash/wm/maximize_mode/maximize_mode_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/maximize_mode/maximize_mode_controller.h
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.h b/ash/wm/maximize_mode/maximize_mode_controller.h
index 4614bef141959fcdce7c6347f79e8abad6a67841..bc4b2240c6bf7b9731915e3b98146187c9e5a595 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller.h
+++ b/ash/wm/maximize_mode/maximize_mode_controller.h
@@ -33,6 +33,9 @@ class MaximizeModeControllerTest;
class ScopedDisableInternalMouseAndKeyboard;
class MaximizeModeWindowManager;
class MaximizeModeWindowManagerTest;
+namespace test {
+class MultiUserWindowManagerChromeOSTest;
+}
// MaximizeModeController listens to accelerometer events and automatically
// enters and exits maximize mode when the lid is opened beyond the triggering
@@ -92,6 +95,12 @@ class ASH_EXPORT MaximizeModeController
// Test if the MaximizeModeWindowManager is enabled or not.
bool IsMaximizeModeWindowManagerEnabled() const;
+ // Add a special window to the MaximizeModeWindowManager for tracking. This is
+ // only required for special windows which are handled by other window
+ // managers like the |MultiUserWindowManager|.
+ // If the maximize mode is not enabled no action will be performed.
+ void AddWindow(aura::Window* window);
+
// TODO(jonross): move this into the destructor. Currently separated as
// ShellOberver notifies of maximize mode ending, and the observers end up
// attempting to access MaximizeModeController via the Shell. If done in
@@ -122,6 +131,7 @@ class ASH_EXPORT MaximizeModeController
private:
friend class MaximizeModeControllerTest;
friend class MaximizeModeWindowManagerTest;
+ friend class test::MultiUserWindowManagerChromeOSTest;
// Set the TickClock. This is only to be used by tests that need to
// artificially and deterministically control the current time.
« no previous file with comments | « no previous file | ash/wm/maximize_mode/maximize_mode_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698