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

Side by Side Diff: webkit/glue/webpreferences.cc

Issue 246079: More WebView / WebViewDelegate cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 | « webkit/glue/webpreferences.h ('k') | webkit/glue/webview.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "webkit/glue/webpreferences.h" 5 #include "webkit/glue/webpreferences.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "webkit/api/public/WebKit.h" 8 #include "webkit/api/public/WebKit.h"
9 #include "webkit/api/public/WebSettings.h" 9 #include "webkit/api/public/WebSettings.h"
10 #include "webkit/api/public/WebString.h" 10 #include "webkit/api/public/WebString.h"
11 #include "webkit/api/public/WebURL.h" 11 #include "webkit/api/public/WebURL.h"
12 #include "webkit/glue/webkit_glue.h" 12 #include "webkit/glue/webkit_glue.h"
13 #include "webkit/glue/webview.h" 13 #include "webkit/glue/webview.h"
14 14
15 using WebKit::WebSettings; 15 using WebKit::WebSettings;
16 using WebKit::WebString;
16 using WebKit::WebURL; 17 using WebKit::WebURL;
17 18
18 void WebPreferences::Apply(WebView* web_view) const { 19 void WebPreferences::Apply(WebView* web_view) const {
19 WebSettings* settings = web_view->settings(); 20 WebSettings* settings = web_view->settings();
20 settings->setStandardFontFamily(WideToUTF16Hack(standard_font_family)); 21 settings->setStandardFontFamily(WideToUTF16Hack(standard_font_family));
21 settings->setFixedFontFamily(WideToUTF16Hack(fixed_font_family)); 22 settings->setFixedFontFamily(WideToUTF16Hack(fixed_font_family));
22 settings->setSerifFontFamily(WideToUTF16Hack(serif_font_family)); 23 settings->setSerifFontFamily(WideToUTF16Hack(serif_font_family));
23 settings->setSansSerifFontFamily(WideToUTF16Hack(sans_serif_font_family)); 24 settings->setSansSerifFontFamily(WideToUTF16Hack(sans_serif_font_family));
24 settings->setCursiveFontFamily(WideToUTF16Hack(cursive_font_family)); 25 settings->setCursiveFontFamily(WideToUTF16Hack(cursive_font_family));
25 settings->setFantasyFontFamily(WideToUTF16Hack(fantasy_font_family)); 26 settings->setFantasyFontFamily(WideToUTF16Hack(fantasy_font_family));
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // We prevent WebKit from checking if it needs to add a "text direction" 74 // We prevent WebKit from checking if it needs to add a "text direction"
74 // submenu to a context menu. it is not only because we don't need the result 75 // submenu to a context menu. it is not only because we don't need the result
75 // but also because it cause a possible crash in Editor::hasBidiSelection(). 76 // but also because it cause a possible crash in Editor::hasBidiSelection().
76 settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded(); 77 settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
77 78
78 // Enable experimental WebGL support if requested on command line 79 // Enable experimental WebGL support if requested on command line
79 // and support is compiled in. 80 // and support is compiled in.
80 settings->setExperimentalWebGLEnabled(experimental_webgl_enabled); 81 settings->setExperimentalWebGLEnabled(experimental_webgl_enabled);
81 82
82 // Web inspector settings need to be passed in differently. 83 // Web inspector settings need to be passed in differently.
83 web_view->SetInspectorSettings(inspector_settings); 84 web_view->setInspectorSettings(WebString::fromUTF8(inspector_settings));
84 85
85 // Tabs to link is not part of the settings. WebCore calls 86 // Tabs to link is not part of the settings. WebCore calls
86 // ChromeClient::tabsToLinks which is part of the glue code. 87 // ChromeClient::tabsToLinks which is part of the glue code.
87 web_view->setTabsToLinks(tabs_to_links); 88 web_view->setTabsToLinks(tabs_to_links);
88 } 89 }
OLDNEW
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | webkit/glue/webview.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698