summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-02 20:32:01 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-02 20:32:01 +0000
commit0f379a544be452cf06276ee2e5494d4a2b372ec4 (patch)
tree6888fa8958caf23a6e944b0105414fb851bfefb8
parentb952647d5b1d00a6b09979c2042e9e2061500d7b (diff)
downloadchromium_src-0f379a544be452cf06276ee2e5494d4a2b372ec4.zip
chromium_src-0f379a544be452cf06276ee2e5494d4a2b372ec4.tar.gz
chromium_src-0f379a544be452cf06276ee2e5494d4a2b372ec4.tar.bz2
Fix the blue tab titles on GTK by hooking up the browser theme provider to the
browser frame. Review URL: http://codereview.chromium.org/118088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17428 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/views/frame/browser_frame_gtk.cc10
-rw-r--r--chrome/browser/views/frame/browser_frame_gtk.h4
2 files changed, 14 insertions, 0 deletions
diff --git a/chrome/browser/views/frame/browser_frame_gtk.cc b/chrome/browser/views/frame/browser_frame_gtk.cc
index 2341e83..ea205bc 100644
--- a/chrome/browser/views/frame/browser_frame_gtk.cc
+++ b/chrome/browser/views/frame/browser_frame_gtk.cc
@@ -59,6 +59,16 @@ void BrowserFrameGtk::UpdateThrobber(bool running) {
}
ThemeProvider* BrowserFrameGtk::GetThemeProviderForFrame() const {
+ // This is implemented for a different interface than GetThemeProvider is,
+ // but they mean the same things.
+ return GetThemeProvider();
+}
+
+ThemeProvider* BrowserFrameGtk::GetThemeProvider() const {
+ return profile_->GetThemeProvider();
+}
+
+ThemeProvider* BrowserFrameGtk::GetDefaultThemeProvider() const {
return profile_->GetThemeProvider();
}
diff --git a/chrome/browser/views/frame/browser_frame_gtk.h b/chrome/browser/views/frame/browser_frame_gtk.h
index 313340c..e3101a8 100644
--- a/chrome/browser/views/frame/browser_frame_gtk.h
+++ b/chrome/browser/views/frame/browser_frame_gtk.h
@@ -32,6 +32,10 @@ class BrowserFrameGtk : public BrowserFrame,
virtual void UpdateThrobber(bool running);
virtual ThemeProvider* GetThemeProviderForFrame() const;
+ // Overridden from views::Widget.
+ virtual ThemeProvider* GetThemeProvider() const;
+ virtual ThemeProvider* GetDefaultThemeProvider() const;
+
protected:
// WidgetGtk overrides.
virtual views::RootView* CreateRootView();