Index: 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 43c82292d6d360d5a4907d63efe6111ecb7fffd8..b11cd5a46de193a6178de235cb377f7452e7b591 100644 |
--- a/chrome/browser/ui/gtk/browser_window_gtk.h |
+++ b/chrome/browser/ui/gtk/browser_window_gtk.h |
@@ -50,11 +50,6 @@ class BrowserWindowGtk : public BrowserWindow, |
public ui::ActiveWindowWatcherXObserver, |
public InfoBarContainer::Delegate { |
public: |
- enum TitleDecoration { |
- PANGO_MARKUP, |
- PLAIN_TEXT |
- }; |
- |
explicit BrowserWindowGtk(Browser* browser); |
virtual ~BrowserWindowGtk(); |
@@ -62,10 +57,6 @@ class BrowserWindowGtk : public BrowserWindow, |
// functions during initialization. |
virtual void Init(); |
- // Allows for a derived class to decorate title text with pango markup. |
- // Returns the type of text used for title. |
- virtual TitleDecoration GetWindowTitle(std::string* title) const; |
- |
// Overridden from BrowserWindow: |
virtual void Show() OVERRIDE; |
virtual void ShowInactive() OVERRIDE; |
@@ -290,6 +281,10 @@ class BrowserWindowGtk : public BrowserWindow, |
// Returns |true| if we should use the custom frame. |
virtual bool UseCustomFrame(); |
+ // Whether we should draw the tab background instead of the theme_frame |
+ // background because this window is a popup. |
+ virtual bool UsingCustomPopupFrame() const; |
+ |
// Called when the window size changed. |
virtual void OnSizeChanged(int width, int height); |
@@ -384,7 +379,7 @@ class BrowserWindowGtk : public BrowserWindow, |
// Returns which frame image we should use based on the window's current |
// activation state / incognito state. |
- int GetThemeFrameResource(); |
+ virtual int GetThemeFrameResource(); |
jennb
2012/04/27 18:36:13
Accidental change? I don't see this overridden in
jianli
2012/04/27 20:22:34
Done.
|
// Invalidate all the widgets that need to redraw when the infobar draw state |
// has changed. |
@@ -449,10 +444,6 @@ class BrowserWindowGtk : public BrowserWindow, |
bool IsToolbarSupported() const; |
bool IsBookmarkBarSupported() const; |
- // Whether we should draw the tab background instead of the theme_frame |
- // background because this window is a popup. |
- bool UsingCustomPopupFrame() const; |
- |
// Returns |true| if the window bounds match the monitor size. |
bool BoundsMatchMonitorSize(); |