diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 06:10:57 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 06:10:57 +0000 |
| commit | 68eeede20e63fbb9a8756ed73e482b87dde57c72 (patch) | |
| tree | 26d1bd889cbfd7b32131d585a97dcb9b447b8733 /chrome/browser/ui/gtk/extensions | |
| parent | c2ff9b4ec2549c5b3b36c11fe2fca7b5495adf9a (diff) | |
| download | chromium_src-68eeede20e63fbb9a8756ed73e482b87dde57c72.zip chromium_src-68eeede20e63fbb9a8756ed73e482b87dde57c72.tar.gz chromium_src-68eeede20e63fbb9a8756ed73e482b87dde57c72.tar.bz2 | |
Save and restore State for ShellWindows, including panels
This replaces ShellWindow::CreateParams::State with
ui::WindowShowState for simplicty and consistency with
Browser session restore.
BUG=233556
TBR=flackr@chromium.org, skuhne@chromium.org, sky@chromium.org
Original CL: https://codereview.chromium.org/14031021/
+ disabled flakey browser tests on linux
Review URL: https://chromiumcodereview.appspot.com/14663010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/extensions')
| -rw-r--r-- | chrome/browser/ui/gtk/extensions/native_app_window_gtk.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/extensions/native_app_window_gtk.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/ui/gtk/extensions/native_app_window_gtk.cc b/chrome/browser/ui/gtk/extensions/native_app_window_gtk.cc index b717e10..6e3a488 100644 --- a/chrome/browser/ui/gtk/extensions/native_app_window_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/native_app_window_gtk.cc @@ -170,6 +170,12 @@ gfx::Rect NativeAppWindowGtk::GetRestoredBounds() const { return window_bounds; } +ui::WindowShowState NativeAppWindowGtk::GetRestoredState() const { + if (IsMaximized()) + return ui::SHOW_STATE_MAXIMIZED; + return ui::SHOW_STATE_NORMAL; +} + gfx::Rect NativeAppWindowGtk::GetBounds() const { gfx::Rect window_bounds = bounds_; window_bounds.Inset(-GetFrameInsets()); @@ -485,6 +491,10 @@ bool NativeAppWindowGtk::IsFullscreenOrPending() const { return content_thinks_its_fullscreen_; } +bool NativeAppWindowGtk::IsDetached() const { + return false; +} + void NativeAppWindowGtk::UpdateWindowIcon() { Profile* profile = shell_window_->profile(); gfx::Image app_icon = shell_window_->app_icon(); diff --git a/chrome/browser/ui/gtk/extensions/native_app_window_gtk.h b/chrome/browser/ui/gtk/extensions/native_app_window_gtk.h index 7facadd..c75c46a 100644 --- a/chrome/browser/ui/gtk/extensions/native_app_window_gtk.h +++ b/chrome/browser/ui/gtk/extensions/native_app_window_gtk.h @@ -36,8 +36,10 @@ class NativeAppWindowGtk : public NativeAppWindow, virtual bool IsMaximized() const OVERRIDE; virtual bool IsMinimized() const OVERRIDE; virtual bool IsFullscreen() const OVERRIDE; + virtual bool IsDetached() const OVERRIDE; virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; virtual gfx::Rect GetRestoredBounds() const OVERRIDE; + virtual ui::WindowShowState GetRestoredState() const OVERRIDE; virtual gfx::Rect GetBounds() const OVERRIDE; virtual void Show() OVERRIDE; virtual void ShowInactive() OVERRIDE; |