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

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

Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ui_zoom stuff to components instead. Created 6 years 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) 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"
11 #include "content/public/browser/host_zoom_map.h" 11 #include "content/public/browser/host_zoom_map.h"
12 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
13 #include "content/public/common/renderer_preferences.h" 13 #include "content/public/common/renderer_preferences.h"
14 #include "third_party/skia/include/core/SkColor.h" 14 #include "third_party/skia/include/core/SkColor.h"
15 15
16 #if defined(OS_LINUX) || defined(OS_ANDROID) 16 #if defined(OS_LINUX) || defined(OS_ANDROID)
17 #include "ui/gfx/font_render_params.h" 17 #include "ui/gfx/font_render_params.h"
18 #endif 18 #endif
19 19
20 #if !defined(OS_ANDROID) 20 #if !defined(OS_ANDROID)
21 #include "chrome/browser/ui/zoom/zoom_controller.h" 21 #include "components/ui/zoom/zoom_controller.h"
22 #endif 22 #endif
23 23
24 #if defined(TOOLKIT_VIEWS) 24 #if defined(TOOLKIT_VIEWS)
25 #include "ui/views/controls/textfield/textfield.h" 25 #include "ui/views/controls/textfield/textfield.h"
26 #endif 26 #endif
27 27
28 #if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) 28 #if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
29 #include "chrome/browser/themes/theme_service.h" 29 #include "chrome/browser/themes/theme_service.h"
30 #include "chrome/browser/themes/theme_service_factory.h" 30 #include "chrome/browser/themes/theme_service_factory.h"
31 #include "ui/views/linux_ui/linux_ui.h" 31 #include "ui/views/linux_ui/linux_ui.h"
32 #endif 32 #endif
33 33
34 namespace renderer_preferences_util { 34 namespace renderer_preferences_util {
35 35
36 void UpdateFromSystemSettings(content::RendererPreferences* prefs, 36 void UpdateFromSystemSettings(content::RendererPreferences* prefs,
37 Profile* profile, 37 Profile* profile,
38 content::WebContents* web_contents) { 38 content::WebContents* web_contents) {
39 const PrefService* pref_service = profile->GetPrefs(); 39 const PrefService* pref_service = profile->GetPrefs();
40 prefs->accept_languages = pref_service->GetString(prefs::kAcceptLanguages); 40 prefs->accept_languages = pref_service->GetString(prefs::kAcceptLanguages);
41 prefs->enable_referrers = pref_service->GetBoolean(prefs::kEnableReferrers); 41 prefs->enable_referrers = pref_service->GetBoolean(prefs::kEnableReferrers);
42 prefs->enable_do_not_track = 42 prefs->enable_do_not_track =
43 pref_service->GetBoolean(prefs::kEnableDoNotTrack); 43 pref_service->GetBoolean(prefs::kEnableDoNotTrack);
44 44
45 double default_zoom_level = -1; 45 double default_zoom_level = -1;
46 #if !defined(OS_ANDROID) 46 #if !defined(OS_ANDROID)
47 ZoomController* zoom_controller = 47 components::ZoomController* zoom_controller =
48 ZoomController::FromWebContents(web_contents); 48 components::ZoomController::FromWebContents(web_contents);
49 if (zoom_controller) 49 if (zoom_controller)
50 default_zoom_level = zoom_controller->GetDefaultZoomLevel(); 50 default_zoom_level = zoom_controller->GetDefaultZoomLevel();
51 #endif 51 #endif
52 52
53 if (default_zoom_level < 0) { 53 if (default_zoom_level < 0) {
54 default_zoom_level = content::HostZoomMap::GetDefaultForBrowserContext( 54 default_zoom_level = content::HostZoomMap::GetDefaultForBrowserContext(
55 web_contents->GetBrowserContext())->GetDefaultZoomLevel(); 55 web_contents->GetBrowserContext())->GetDefaultZoomLevel();
56 } 56 }
57 prefs->default_zoom_level = default_zoom_level; 57 prefs->default_zoom_level = default_zoom_level;
58 58
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 prefs->subpixel_rendering = params.subpixel_rendering; 104 prefs->subpixel_rendering = params.subpixel_rendering;
105 #endif 105 #endif
106 106
107 #if !defined(OS_MACOSX) 107 #if !defined(OS_MACOSX)
108 prefs->plugin_fullscreen_allowed = 108 prefs->plugin_fullscreen_allowed =
109 pref_service->GetBoolean(prefs::kFullscreenAllowed); 109 pref_service->GetBoolean(prefs::kFullscreenAllowed);
110 #endif 110 #endif
111 } 111 }
112 112
113 } // namespace renderer_preferences_util 113 } // namespace renderer_preferences_util
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698