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

Side by Side Diff: chrome/browser/renderer_preferences_util.cc

Issue 525016: Update RenderPreferences on GTK change. (Closed)
Patch Set: style nit Created 10 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_preferences_util.h" 5 #include "chrome/browser/renderer_preferences_util.h"
6 6
7 #include "base/singleton.h"
8 #include "chrome/browser/profile.h" 7 #include "chrome/browser/profile.h"
9 8
10 #if defined(OS_LINUX) 9 #if defined(OS_LINUX)
11 #include "chrome/browser/gtk/gtk_theme_provider.h" 10 #include "chrome/browser/gtk/gtk_theme_provider.h"
12 #include "chrome/common/gtk_util.h" 11 #include "chrome/common/gtk_util.h"
13 #endif 12 #endif
14 13
15 namespace renderer_preferences_util { 14 namespace renderer_preferences_util {
16 15
17 RendererPreferences GetInitedRendererPreferences(Profile* profile) { 16 void UpdateFromSystemSettings(RendererPreferences* prefs, Profile* profile) {
18 RendererPreferences* prefs = Singleton<RendererPreferences>::get();
19 #if defined(OS_LINUX) 17 #if defined(OS_LINUX)
20 static bool inited = false; 18 gtk_util::UpdateGtkFontSettings(prefs);
21 if (!inited) { 19
22 gtk_util::InitRendererPrefsFromGtkSettings(prefs, 20 #if !defined(TOOLKIT_VIEWS)
23 GtkThemeProvider::GetFrom(profile)->UseGtkTheme()); 21 GtkThemeProvider* provider = GtkThemeProvider::GetFrom(profile);
24 inited = true; 22
25 } 23 prefs->focus_ring_color = provider->get_focus_ring_color();
26 #endif 24 prefs->thumb_active_color = provider->get_thumb_active_color();
27 return *prefs; 25 prefs->thumb_inactive_color = provider->get_thumb_inactive_color();
26 prefs->track_color = provider->get_track_color();
27 #endif // !defined(TOOLKIT_VIEWS)
28 #endif // defined(OS_LINUX)
28 } 29 }
29 30
30 } // renderer_preferences_util 31 } // renderer_preferences_util
OLDNEW
« no previous file with comments | « chrome/browser/renderer_preferences_util.h ('k') | chrome/browser/tab_contents/interstitial_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698