Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1480)

Unified Diff: chrome/browser/gtk/browser_window_gtk.cc

Issue 150176: GTK: First draft of using native themes, partially based on evan's CL 118358. (Closed)
Patch Set: And the codereview tool is back. Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 2060ca4c66863108b25f0084567222b4863d2803..529ecd63fe3e195cd18fc4be578cf8a68eab6802 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -10,6 +10,7 @@
#include "app/resource_bundle.h"
#include "app/theme_provider.h"
#include "base/base_paths_linux.h"
+#include "base/command_line.h"
#include "base/gfx/gtk_util.h"
#include "base/logging.h"
#include "base/message_loop.h"
@@ -34,6 +35,7 @@
#include "chrome/browser/gtk/edit_search_engine_dialog.h"
#include "chrome/browser/gtk/find_bar_gtk.h"
#include "chrome/browser/gtk/go_button_gtk.h"
+#include "chrome/browser/gtk/gtk_theme_provider.h"
#include "chrome/browser/gtk/import_dialog_gtk.h"
#include "chrome/browser/gtk/infobar_container_gtk.h"
#include "chrome/browser/gtk/keyword_editor_view.h"
@@ -713,6 +715,9 @@ void BrowserWindowGtk::UserChangedTheme() {
SetBackgroundColor();
gdk_window_invalidate_rect(GTK_WIDGET(window_)->window,
&GTK_WIDGET(window_)->allocation, TRUE);
+
+ toolbar_->UserChangedTheme();
+ bookmark_bar_->UserChangedTheme(browser_->profile());
}
int BrowserWindowGtk::GetExtraRenderViewHeight() const {
@@ -1039,9 +1044,8 @@ void BrowserWindowGtk::InitWidgets() {
void BrowserWindowGtk::SetBackgroundColor() {
// TODO(tc): Handle active/inactive colors.
-
- ThemeProvider* theme_provider = browser()->profile()->GetThemeProvider();
-
+ Profile* profile = browser()->profile();
+ ThemeProvider* theme_provider = profile->GetThemeProvider();
SkColor frame_color;
if (browser()->profile()->IsOffTheRecord()) {
frame_color = theme_provider->GetColor(

Powered by Google App Engine
This is Rietveld 408576698