| Index: chrome/browser/ui/panels/panel_browser_window_gtk.h
|
| diff --git a/chrome/browser/ui/panels/panel_browser_window_gtk.h b/chrome/browser/ui/panels/panel_browser_window_gtk.h
|
| index 8f6c447e1cdeeef5827014078f86d23e1bf8f831..7efe79493a4e6daebe742930f2a5a1ec0c1b47fd 100644
|
| --- a/chrome/browser/ui/panels/panel_browser_window_gtk.h
|
| +++ b/chrome/browser/ui/panels/panel_browser_window_gtk.h
|
| @@ -10,6 +10,7 @@
|
| #include "chrome/browser/ui/gtk/menu_gtk.h"
|
| #include "chrome/browser/ui/panels/native_panel.h"
|
| #include "ui/base/animation/animation_delegate.h"
|
| +#include "ui/base/x/work_area_watcher_x.h"
|
|
|
| class Panel;
|
| class PanelSettingsMenuModel;
|
| @@ -22,17 +23,18 @@ class SlideAnimation;
|
| }
|
|
|
| class PanelBrowserWindowGtk : public BrowserWindowGtk,
|
| - public NativePanel,
|
| public MenuGtk::Delegate,
|
| public MessageLoopForUI::Observer,
|
| - public ui::AnimationDelegate {
|
| + public NativePanel,
|
| + public ui::AnimationDelegate,
|
| + public ui::WorkAreaWatcherX::Observer {
|
| friend class NativePanelTestingGtk;
|
| public:
|
| PanelBrowserWindowGtk(Browser* browser, Panel* panel,
|
| const gfx::Rect& bounds);
|
| virtual ~PanelBrowserWindowGtk();
|
|
|
| - // BrowserWindowGtk overrides
|
| + // BrowserWindowGtk override
|
| virtual void Init() OVERRIDE;
|
|
|
| // BrowserWindow overrides
|
| @@ -41,6 +43,9 @@ class PanelBrowserWindowGtk : public BrowserWindowGtk,
|
| GdkEventButton* event) OVERRIDE;
|
| virtual TitleDecoration GetWindowTitle(std::string* title) const OVERRIDE;
|
|
|
| + // ui::WorkAreaWatcherX::Observer override
|
| + void WorkAreaChanged() OVERRIDE;
|
| +
|
| protected:
|
| // BrowserWindowGtk overrides
|
| virtual bool GetWindowEdge(int x, int y, GdkWindowEdge* edge) OVERRIDE;
|
| @@ -59,7 +64,6 @@ class PanelBrowserWindowGtk : public BrowserWindowGtk,
|
| virtual void HandleFocusIn(GtkWidget* widget,
|
| GdkEventFocus* event) OVERRIDE;
|
|
|
| -
|
| // Overridden from NativePanel:
|
| virtual void ShowPanel() OVERRIDE;
|
| virtual void ShowPanelInactive() OVERRIDE;
|
|
|