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

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

Issue 247363005: Fullscreen/immersive mode is allowed in touch view mode, the shelf gets hidden and an edge swipe br… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
Index: ash/wm/maximize_mode/maximize_mode_window_state.h
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.h b/ash/wm/maximize_mode/maximize_mode_window_state.h
index f1b826efc470cc560872f0bbcd2ece957dae38f1..45b79cb8f91259b0cfc00478a74c820ca29c91b3 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_state.h
+++ b/ash/wm/maximize_mode/maximize_mode_window_state.h
@@ -41,9 +41,17 @@ class MaximizeModeWindowState : public wm::WindowState::State {
virtual void DetachState(wm::WindowState* window_state) OVERRIDE;
private:
- // Centers the window on top of the workspace or maximizes it. If |animate| is
- // set to true, a bounds change will be animated - otherwise immediate.
- void MaximizeOrCenterWindow(wm::WindowState* window_state, bool animate);
+ enum ShowState {
+ MAXIMIZED_OR_CENTERED, // The window is either maximized or centered.
+ FULL_SCREEN // The window is full screen.
+ };
+ // Shows the window either fullscreen, maximized or centered on the screen -
+ // dependent on flags and window capabilities. |show_state| defines if either
+ // full screen or maximized / centered should be used. If |animate| is set, a
+ // bounds change will be animated, otherwise it will immediately be set.
+ void ShowWindow(wm::WindowState* window_state,
+ ShowState show_state,
+ bool animate);
// Minimize the window.
void Minimize(wm::WindowState* window_state);

Powered by Google App Engine
This is Rietveld 408576698