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

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

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to 291677. Created 6 years, 4 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 | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ui/browser_browsertest.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 "base/macros.h" 7 #include "base/macros.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 16 matching lines...) Expand all
27 27
28 namespace renderer_preferences_util { 28 namespace renderer_preferences_util {
29 29
30 void UpdateFromSystemSettings( 30 void UpdateFromSystemSettings(
31 content::RendererPreferences* prefs, Profile* profile) { 31 content::RendererPreferences* prefs, Profile* profile) {
32 const PrefService* pref_service = profile->GetPrefs(); 32 const PrefService* pref_service = profile->GetPrefs();
33 prefs->accept_languages = pref_service->GetString(prefs::kAcceptLanguages); 33 prefs->accept_languages = pref_service->GetString(prefs::kAcceptLanguages);
34 prefs->enable_referrers = pref_service->GetBoolean(prefs::kEnableReferrers); 34 prefs->enable_referrers = pref_service->GetBoolean(prefs::kEnableReferrers);
35 prefs->enable_do_not_track = 35 prefs->enable_do_not_track =
36 pref_service->GetBoolean(prefs::kEnableDoNotTrack); 36 pref_service->GetBoolean(prefs::kEnableDoNotTrack);
37 prefs->default_zoom_level = pref_service->GetDouble(prefs::kDefaultZoomLevel); 37 prefs->default_zoom_level = profile->GetDefaultZoomLevel();
wjmaclean 2014/08/26 15:36:21 Hmm, I think this may be wrong ... should be site-
38 38
39 #if defined(USE_DEFAULT_RENDER_THEME) 39 #if defined(USE_DEFAULT_RENDER_THEME)
40 prefs->focus_ring_color = SkColorSetRGB(0x4D, 0x90, 0xFE); 40 prefs->focus_ring_color = SkColorSetRGB(0x4D, 0x90, 0xFE);
41 41
42 #if defined(OS_CHROMEOS) 42 #if defined(OS_CHROMEOS)
43 // This color is 0x544d90fe modulated with 0xffffff. 43 // This color is 0x544d90fe modulated with 0xffffff.
44 prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA); 44 prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA);
45 prefs->active_selection_fg_color = SK_ColorBLACK; 45 prefs->active_selection_fg_color = SK_ColorBLACK;
46 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA); 46 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA);
47 prefs->inactive_selection_fg_color = SK_ColorBLACK; 47 prefs->inactive_selection_fg_color = SK_ColorBLACK;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 prefs->subpixel_rendering = params.subpixel_rendering; 98 prefs->subpixel_rendering = params.subpixel_rendering;
99 #endif 99 #endif
100 100
101 #if !defined(OS_MACOSX) 101 #if !defined(OS_MACOSX)
102 prefs->plugin_fullscreen_allowed = 102 prefs->plugin_fullscreen_allowed =
103 pref_service->GetBoolean(prefs::kFullscreenAllowed); 103 pref_service->GetBoolean(prefs::kFullscreenAllowed);
104 #endif 104 #endif
105 } 105 }
106 106
107 } // namespace renderer_preferences_util 107 } // namespace renderer_preferences_util
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698