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

Side by Side Diff: ash/common/wm_window.h

Issue 2622053004: ash: Restore previous show state after exiting fullscreen. (Closed)
Patch Set: Rebase Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « ash/common/wm/window_state_util.cc ('k') | ash/common/wm_window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_COMMON_WM_WINDOW_H_ 5 #ifndef ASH_COMMON_WM_WINDOW_H_
6 #define ASH_COMMON_WM_WINDOW_H_ 6 #define ASH_COMMON_WM_WINDOW_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 gfx::Rect GetTargetBounds(); 257 gfx::Rect GetTargetBounds();
258 void ClearRestoreBounds(); 258 void ClearRestoreBounds();
259 void SetRestoreBoundsInScreen(const gfx::Rect& bounds); 259 void SetRestoreBoundsInScreen(const gfx::Rect& bounds);
260 gfx::Rect GetRestoreBoundsInScreen() const; 260 gfx::Rect GetRestoreBoundsInScreen() const;
261 261
262 bool Contains(const WmWindow* other) const; 262 bool Contains(const WmWindow* other) const;
263 263
264 void SetShowState(ui::WindowShowState show_state); 264 void SetShowState(ui::WindowShowState show_state);
265 ui::WindowShowState GetShowState() const; 265 ui::WindowShowState GetShowState() const;
266 266
267 void SetRestoreShowState(ui::WindowShowState show_state); 267 void SetPreMinimizedShowState(ui::WindowShowState show_state);
268 ui::WindowShowState GetPreMinimizedShowState() const;
269 void SetPreFullscreenShowState(ui::WindowShowState show_state);
268 270
269 // Sets the restore bounds and show state overrides. These values take 271 // Sets the restore bounds and show state overrides. These values take
270 // precedence over the restore bounds and restore show state (if set). 272 // precedence over the restore bounds and restore show state (if set).
271 // If |bounds_override| is empty the values are cleared. 273 // If |bounds_override| is empty the values are cleared.
272 void SetRestoreOverrides(const gfx::Rect& bounds_override, 274 void SetRestoreOverrides(const gfx::Rect& bounds_override,
273 ui::WindowShowState window_state_override); 275 ui::WindowShowState window_state_override);
274 276
275 // If |value| is true the window can not be moved to another root, regardless 277 // If |value| is true the window can not be moved to another root, regardless
276 // of the bounds set on it. 278 // of the bounds set on it.
277 void SetLockedToRoot(bool value); 279 void SetLockedToRoot(bool value);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 // forward to an associated widget. 312 // forward to an associated widget.
311 void CloseWidget(); 313 void CloseWidget();
312 314
313 void SetFocused(); 315 void SetFocused();
314 bool IsFocused() const; 316 bool IsFocused() const;
315 317
316 bool IsActive() const; 318 bool IsActive() const;
317 void Activate(); 319 void Activate();
318 void Deactivate(); 320 void Deactivate();
319 321
320 void SetFullscreen(); 322 void SetFullscreen(bool fullscreen);
321 323
322 void Maximize(); 324 void Maximize();
323 void Minimize(); 325 void Minimize();
324 void Unminimize(); 326 void Unminimize();
325 327
326 std::vector<WmWindow*> GetChildren(); 328 std::vector<WmWindow*> GetChildren();
327 329
328 // Shows/hides the resize shadow. |component| is the component to show the 330 // Shows/hides the resize shadow. |component| is the component to show the
329 // shadow for (one of the constants in ui/base/hit_test.h). 331 // shadow for (one of the constants in ui/base/hit_test.h).
330 void ShowResizeShadow(int component); 332 void ShowResizeShadow(int component);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 413
412 // If true the minimum size is 0x0, default is minimum size comes from widget. 414 // If true the minimum size is 0x0, default is minimum size comes from widget.
413 bool use_empty_minimum_size_for_testing_; 415 bool use_empty_minimum_size_for_testing_;
414 416
415 DISALLOW_COPY_AND_ASSIGN(WmWindow); 417 DISALLOW_COPY_AND_ASSIGN(WmWindow);
416 }; 418 };
417 419
418 } // namespace ash 420 } // namespace ash
419 421
420 #endif // ASH_COMMON_WM_WINDOW_H_ 422 #endif // ASH_COMMON_WM_WINDOW_H_
OLDNEW
« no previous file with comments | « ash/common/wm/window_state_util.cc ('k') | ash/common/wm_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698