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 99bd907bb9d9d59e24bad2dc09487080a9593e41..8fc1418a5156a915c8fd4c9ddfa24fbb50c1027f 100644 |
--- a/chrome/browser/ui/panels/panel_browser_window_gtk.h |
+++ b/chrome/browser/ui/panels/panel_browser_window_gtk.h |
@@ -13,9 +13,14 @@ |
class Panel; |
class PanelBoundsAnimation; |
+class PanelBrowserTitlebarGtk; |
class PanelDragGtk; |
class NativePanelTestingGtk; |
+namespace gfx { |
+class Image; |
+} |
+ |
class PanelBrowserWindowGtk : public BrowserWindowGtk, |
public NativePanel, |
public ui::AnimationDelegate { |
@@ -29,13 +34,16 @@ class PanelBrowserWindowGtk : public BrowserWindowGtk, |
// BrowserWindow overrides |
virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; |
- virtual TitleDecoration GetWindowTitle(std::string* title) const OVERRIDE; |
+ virtual bool IsMinimized() const OVERRIDE; |
// Overrides BrowserWindowGtk::NotificationObserver::Observe |
virtual void Observe(int type, |
const content::NotificationSource& source, |
const content::NotificationDetails& details) OVERRIDE; |
+ // NativePanel overrides |
jennb
2012/04/27 18:36:13
Please don't separate the NativePanel overrides.
jianli
2012/04/27 20:22:34
Moved it back since we're not relying on getting p
|
+ virtual bool IsDrawingAttention() const OVERRIDE; |
+ |
Panel* panel() const { return panel_.get(); } |
protected: |
@@ -53,6 +61,7 @@ class PanelBrowserWindowGtk : public BrowserWindowGtk, |
virtual void SaveWindowPosition() OVERRIDE; |
virtual void SetGeometryHints() OVERRIDE; |
virtual bool UseCustomFrame() OVERRIDE; |
+ virtual bool UsingCustomPopupFrame() const OVERRIDE; |
virtual void OnSizeChanged(int width, int height) OVERRIDE; |
virtual void DrawCustomFrame(cairo_t* cr, GtkWidget* widget, |
GdkEventExpose* event) OVERRIDE; |
@@ -82,7 +91,6 @@ class PanelBrowserWindowGtk : public BrowserWindowGtk, |
virtual void PanelCopy() OVERRIDE; |
virtual void PanelPaste() OVERRIDE; |
virtual void DrawAttention(bool draw_attention) OVERRIDE; |
- virtual bool IsDrawingAttention() const OVERRIDE; |
virtual bool PreHandlePanelKeyboardEvent( |
const NativeWebKeyboardEvent& event, |
bool* is_keyboard_shortcut) OVERRIDE; |
@@ -118,9 +126,9 @@ class PanelBrowserWindowGtk : public BrowserWindowGtk, |
void SetBoundsInternal(const gfx::Rect& bounds, bool animate); |
- void DrawAttentionFrame(cairo_t* cr, GtkWidget* widget, |
- GdkEventExpose* event); |
- GdkRectangle GetTitlebarRectForDrawAttention() const; |
+ PanelBrowserTitlebarGtk* GetTitlebar() const; |
jennb
2012/04/27 18:36:13
This gets confusing with base class having a title
jianli
2012/04/27 20:22:34
Done.
|
+ |
+ const gfx::Image* GetFrameTheme() const; |
CHROMEGTK_CALLBACK_1(PanelBrowserWindowGtk, gboolean, |
OnTitlebarButtonReleaseEvent, GdkEventButton*); |