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

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

Issue 10337010: Revert r123782. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/speech/speech_recognition_bubble_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/prefs/pref_service.h" 7 #include "chrome/browser/prefs/pref_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/common/pref_names.h" 9 #include "chrome/common/pref_names.h"
10 #include "content/public/common/renderer_preferences.h" 10 #include "content/public/common/renderer_preferences.h"
11 11
12 #if defined(TOOLKIT_GTK) 12 #if defined(TOOLKIT_GTK)
13 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
13 #include "chrome/browser/ui/gtk/gtk_util.h" 14 #include "chrome/browser/ui/gtk/gtk_util.h"
14 #include "chrome/browser/ui/gtk/theme_service_gtk.h"
15 #endif 15 #endif
16 16
17 namespace renderer_preferences_util { 17 namespace renderer_preferences_util {
18 18
19 void UpdateFromSystemSettings( 19 void UpdateFromSystemSettings(
20 content::RendererPreferences* prefs, Profile* profile) { 20 content::RendererPreferences* prefs, Profile* profile) {
21 #if defined(TOOLKIT_GTK) 21 #if defined(TOOLKIT_GTK)
22 gtk_util::UpdateGtkFontSettings(prefs); 22 gtk_util::UpdateGtkFontSettings(prefs);
23 23
24 ThemeServiceGtk* theme_service = ThemeServiceGtk::GetFrom(profile); 24 GtkThemeService* theme_service = GtkThemeService::GetFrom(profile);
25 25
26 prefs->focus_ring_color = theme_service->get_focus_ring_color(); 26 prefs->focus_ring_color = theme_service->get_focus_ring_color();
27 prefs->thumb_active_color = theme_service->get_thumb_active_color(); 27 prefs->thumb_active_color = theme_service->get_thumb_active_color();
28 prefs->thumb_inactive_color = theme_service->get_thumb_inactive_color(); 28 prefs->thumb_inactive_color = theme_service->get_thumb_inactive_color();
29 prefs->track_color = theme_service->get_track_color(); 29 prefs->track_color = theme_service->get_track_color();
30 prefs->active_selection_bg_color = 30 prefs->active_selection_bg_color =
31 theme_service->get_active_selection_bg_color(); 31 theme_service->get_active_selection_bg_color();
32 prefs->active_selection_fg_color = 32 prefs->active_selection_fg_color =
33 theme_service->get_active_selection_fg_color(); 33 theme_service->get_active_selection_fg_color();
34 prefs->inactive_selection_bg_color = 34 prefs->inactive_selection_bg_color =
35 theme_service->get_inactive_selection_bg_color(); 35 theme_service->get_inactive_selection_bg_color();
36 prefs->inactive_selection_fg_color = 36 prefs->inactive_selection_fg_color =
37 theme_service->get_inactive_selection_fg_color(); 37 theme_service->get_inactive_selection_fg_color();
38 #elif defined(USE_ASH) 38 #elif defined(USE_ASH)
39 // This color is 0x544d90fe modulated with 0xffffff. 39 // This color is 0x544d90fe modulated with 0xffffff.
40 prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA); 40 prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA);
41 prefs->active_selection_fg_color = SK_ColorBLACK; 41 prefs->active_selection_fg_color = SK_ColorBLACK;
42 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA); 42 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA);
43 prefs->inactive_selection_fg_color = SK_ColorBLACK; 43 prefs->inactive_selection_fg_color = SK_ColorBLACK;
44 #endif 44 #endif
45 45
46 prefs->enable_referrers = 46 prefs->enable_referrers =
47 profile->GetPrefs()->GetBoolean(prefs::kEnableReferrers); 47 profile->GetPrefs()->GetBoolean(prefs::kEnableReferrers);
48 prefs->default_zoom_level = 48 prefs->default_zoom_level =
49 profile->GetPrefs()->GetDouble(prefs::kDefaultZoomLevel); 49 profile->GetPrefs()->GetDouble(prefs::kDefaultZoomLevel);
50 } 50 }
51 51
52 } // renderer_preferences_util 52 } // renderer_preferences_util
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/speech/speech_recognition_bubble_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698