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

Side by Side Diff: content/renderer/web_preferences.cc

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | « content/renderer/v8_value_converter_impl.cc ('k') | content/renderer/web_ui_extension.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/public/renderer/web_preferences.h" 5 #include "content/public/renderer/web_preferences.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "third_party/WebKit/public/platform/WebString.h" 8 #include "third_party/WebKit/public/platform/WebString.h"
9 #include "third_party/WebKit/public/platform/WebURL.h" 9 #include "third_party/WebKit/public/platform/WebURL.h"
10 #include "third_party/WebKit/public/web/WebKit.h" 10 #include "third_party/WebKit/public/web/WebKit.h"
11 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h" 11 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h"
12 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 12 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
13 #include "third_party/WebKit/public/web/WebSettings.h" 13 #include "third_party/WebKit/public/web/WebSettings.h"
14 #include "third_party/WebKit/public/web/WebView.h" 14 #include "third_party/WebKit/public/web/WebView.h"
15 #include "third_party/icu/source/common/unicode/uchar.h" 15 #include "third_party/icu/source/common/unicode/uchar.h"
16 #include "third_party/icu/source/common/unicode/uscript.h" 16 #include "third_party/icu/source/common/unicode/uscript.h"
17 #include "webkit/common/webpreferences.h" 17 #include "webkit/common/webpreferences.h"
18 18
19 using WebKit::WebNetworkStateNotifier; 19 using blink::WebNetworkStateNotifier;
20 using WebKit::WebRuntimeFeatures; 20 using blink::WebRuntimeFeatures;
21 using WebKit::WebSettings; 21 using blink::WebSettings;
22 using WebKit::WebString; 22 using blink::WebString;
23 using WebKit::WebURL; 23 using blink::WebURL;
24 using WebKit::WebView; 24 using blink::WebView;
25 25
26 namespace content { 26 namespace content {
27 27
28 namespace { 28 namespace {
29 29
30 typedef void (*SetFontFamilyWrapper)(WebKit::WebSettings*, 30 typedef void (*SetFontFamilyWrapper)(blink::WebSettings*,
31 const base::string16&, 31 const base::string16&,
32 UScriptCode); 32 UScriptCode);
33 33
34 void setStandardFontFamilyWrapper(WebSettings* settings, 34 void setStandardFontFamilyWrapper(WebSettings* settings,
35 const base::string16& font, 35 const base::string16& font,
36 UScriptCode script) { 36 UScriptCode script) {
37 settings->setStandardFontFamily(font, script); 37 settings->setStandardFontFamily(font, script);
38 } 38 }
39 39
40 void setFixedFontFamilyWrapper(WebSettings* settings, 40 void setFixedFontFamilyWrapper(WebSettings* settings,
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 settings->setPinchVirtualViewportEnabled( 366 settings->setPinchVirtualViewportEnabled(
367 prefs.pinch_virtual_viewport_enabled); 367 prefs.pinch_virtual_viewport_enabled);
368 368
369 settings->setPinchOverlayScrollbarThickness( 369 settings->setPinchOverlayScrollbarThickness(
370 prefs.pinch_overlay_scrollbar_thickness); 370 prefs.pinch_overlay_scrollbar_thickness);
371 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 371 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
372 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing); 372 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);
373 } 373 }
374 374
375 } // namespace content 375 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/v8_value_converter_impl.cc ('k') | content/renderer/web_ui_extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698