OLD | NEW |
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/browser/ui/zoom/zoom_controller.h" |
10 #include "chrome/common/pref_names.h" | 11 #include "chrome/common/pref_names.h" |
| 12 #include "content/public/browser/host_zoom_map.h" |
11 #include "content/public/common/renderer_preferences.h" | 13 #include "content/public/common/renderer_preferences.h" |
12 #include "third_party/skia/include/core/SkColor.h" | 14 #include "third_party/skia/include/core/SkColor.h" |
13 | 15 |
14 #if defined(OS_LINUX) || defined(OS_ANDROID) | 16 #if defined(OS_LINUX) || defined(OS_ANDROID) |
15 #include "ui/gfx/font_render_params.h" | 17 #include "ui/gfx/font_render_params.h" |
16 #endif | 18 #endif |
17 | 19 |
18 #if defined(TOOLKIT_VIEWS) | 20 #if defined(TOOLKIT_VIEWS) |
19 #include "ui/views/controls/textfield/textfield.h" | 21 #include "ui/views/controls/textfield/textfield.h" |
20 #endif | 22 #endif |
21 | 23 |
22 #if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) | 24 #if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) |
23 #include "chrome/browser/themes/theme_service.h" | 25 #include "chrome/browser/themes/theme_service.h" |
24 #include "chrome/browser/themes/theme_service_factory.h" | 26 #include "chrome/browser/themes/theme_service_factory.h" |
25 #include "ui/views/linux_ui/linux_ui.h" | 27 #include "ui/views/linux_ui/linux_ui.h" |
26 #endif | 28 #endif |
27 | 29 |
28 namespace renderer_preferences_util { | 30 namespace renderer_preferences_util { |
29 | 31 |
30 void UpdateFromSystemSettings( | 32 void UpdateFromSystemSettings(content::RendererPreferences* prefs, |
31 content::RendererPreferences* prefs, Profile* profile) { | 33 Profile* profile, |
| 34 content::WebContents* web_contents) { |
32 const PrefService* pref_service = profile->GetPrefs(); | 35 const PrefService* pref_service = profile->GetPrefs(); |
33 prefs->accept_languages = pref_service->GetString(prefs::kAcceptLanguages); | 36 prefs->accept_languages = pref_service->GetString(prefs::kAcceptLanguages); |
34 prefs->enable_referrers = pref_service->GetBoolean(prefs::kEnableReferrers); | 37 prefs->enable_referrers = pref_service->GetBoolean(prefs::kEnableReferrers); |
35 prefs->enable_do_not_track = | 38 prefs->enable_do_not_track = |
36 pref_service->GetBoolean(prefs::kEnableDoNotTrack); | 39 pref_service->GetBoolean(prefs::kEnableDoNotTrack); |
37 prefs->default_zoom_level = pref_service->GetDouble(prefs::kDefaultZoomLevel); | 40 ZoomController* zoom_controller = |
| 41 ZoomController::FromWebContents(web_contents); |
| 42 if (zoom_controller) { |
| 43 prefs->default_zoom_level = zoom_controller->GetDefaultZoomLevel(); |
| 44 } else { |
| 45 prefs->default_zoom_level = |
| 46 content::HostZoomMap::GetDefaultForBrowserContext( |
| 47 web_contents->GetBrowserContext())->GetDefaultZoomLevel(); |
| 48 } |
38 | 49 |
39 #if defined(USE_DEFAULT_RENDER_THEME) | 50 #if defined(USE_DEFAULT_RENDER_THEME) |
40 prefs->focus_ring_color = SkColorSetRGB(0x4D, 0x90, 0xFE); | 51 prefs->focus_ring_color = SkColorSetRGB(0x4D, 0x90, 0xFE); |
41 #if defined(OS_CHROMEOS) | 52 #if defined(OS_CHROMEOS) |
42 // This color is 0x544d90fe modulated with 0xffffff. | 53 // This color is 0x544d90fe modulated with 0xffffff. |
43 prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA); | 54 prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA); |
44 prefs->active_selection_fg_color = SK_ColorBLACK; | 55 prefs->active_selection_fg_color = SK_ColorBLACK; |
45 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA); | 56 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA); |
46 prefs->inactive_selection_fg_color = SK_ColorBLACK; | 57 prefs->inactive_selection_fg_color = SK_ColorBLACK; |
47 #endif | 58 #endif |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 prefs->subpixel_rendering = params.subpixel_rendering; | 95 prefs->subpixel_rendering = params.subpixel_rendering; |
85 #endif | 96 #endif |
86 | 97 |
87 #if !defined(OS_MACOSX) | 98 #if !defined(OS_MACOSX) |
88 prefs->plugin_fullscreen_allowed = | 99 prefs->plugin_fullscreen_allowed = |
89 pref_service->GetBoolean(prefs::kFullscreenAllowed); | 100 pref_service->GetBoolean(prefs::kFullscreenAllowed); |
90 #endif | 101 #endif |
91 } | 102 } |
92 | 103 |
93 } // namespace renderer_preferences_util | 104 } // namespace renderer_preferences_util |
OLD | NEW |