From 68eeede20e63fbb9a8756ed73e482b87dde57c72 Mon Sep 17 00:00:00 2001 From: "stevenjb@chromium.org" Date: Thu, 9 May 2013 06:10:57 +0000 Subject: 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 --- chrome/browser/ui/gtk/browser_window_gtk.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'chrome/browser/ui/gtk/browser_window_gtk.h') diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h index 5ff445f..67dac6b 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.h +++ b/chrome/browser/ui/gtk/browser_window_gtk.h @@ -59,13 +59,13 @@ class PrefRegistrySyncable; // An implementation of BrowserWindow for GTK. Cross-platform code will interact // with this object when it needs to manipulate the window. -class BrowserWindowGtk : - public BrowserWindow, - public content::NotificationObserver, - public TabStripModelObserver, - public ui::ActiveWindowWatcherXObserver, - public InfoBarContainer::Delegate, - public extensions::ExtensionKeybindingRegistry::Delegate { +class BrowserWindowGtk + : public BrowserWindow, + public content::NotificationObserver, + public TabStripModelObserver, + public ui::ActiveWindowWatcherXObserver, + public InfoBarContainer::Delegate, + public extensions::ExtensionKeybindingRegistry::Delegate { public: explicit BrowserWindowGtk(Browser* browser); virtual ~BrowserWindowGtk(); @@ -95,6 +95,7 @@ class BrowserWindowGtk : virtual void SetStarredState(bool is_starred) OVERRIDE; virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE; virtual gfx::Rect GetRestoredBounds() const OVERRIDE; + virtual ui::WindowShowState GetRestoredState() const OVERRIDE; virtual gfx::Rect GetBounds() const OVERRIDE; virtual bool IsMaximized() const OVERRIDE; virtual bool IsMinimized() const OVERRIDE; -- cgit v1.1