| Index: ash/common/wm_window.h
|
| diff --git a/ash/common/wm_window.h b/ash/common/wm_window.h
|
| index b8aef305f1b6c6f1f538747118b84344ae94339e..c855661f902b67cd19c6e587a1ee52847684bdd6 100644
|
| --- a/ash/common/wm_window.h
|
| +++ b/ash/common/wm_window.h
|
| @@ -264,7 +264,9 @@ class ASH_EXPORT WmWindow : public aura::WindowObserver,
|
| void SetShowState(ui::WindowShowState show_state);
|
| ui::WindowShowState GetShowState() const;
|
|
|
| - void SetRestoreShowState(ui::WindowShowState show_state);
|
| + void SetPreMinimizedShowState(ui::WindowShowState show_state);
|
| + ui::WindowShowState GetPreMinimizedShowState() const;
|
| + void SetPreFullscreenShowState(ui::WindowShowState show_state);
|
|
|
| // Sets the restore bounds and show state overrides. These values take
|
| // precedence over the restore bounds and restore show state (if set).
|
| @@ -317,7 +319,7 @@ class ASH_EXPORT WmWindow : public aura::WindowObserver,
|
| void Activate();
|
| void Deactivate();
|
|
|
| - void SetFullscreen();
|
| + void SetFullscreen(bool fullscreen);
|
|
|
| void Maximize();
|
| void Minimize();
|
|
|