webkit/glue/webpreferences.cc - Issue 387020: Upstreaming WebKit.gyp

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 387020: Upstreaming WebKit.gyp (Closed)

Patch Set: Created 11 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

OLD	NEW
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/WebRuntimeFeatures.h"	8 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h"

9 #include "webkit/api/public/WebKit.h"	9 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"

10 #include "webkit/api/public/WebSettings.h"	10 #include "third_party/WebKit/WebKit/chromium/public/WebSettings.h"

11 #include "webkit/api/public/WebString.h"	11 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"

12 #include "webkit/api/public/WebURL.h"	12 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"

13 #include "webkit/api/public/WebView.h"	13 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"

14 #include "webkit/glue/webkit_glue.h"	14 #include "webkit/glue/webkit_glue.h"

15	15

16 using WebKit::WebRuntimeFeatures;	16 using WebKit::WebRuntimeFeatures;

17 using WebKit::WebSettings;	17 using WebKit::WebSettings;

18 using WebKit::WebString;	18 using WebKit::WebString;

19 using WebKit::WebURL;	19 using WebKit::WebURL;

20 using WebKit::WebView;	20 using WebKit::WebView;

21	21

22 void WebPreferences::Apply(WebView* web_view) const {	22 void WebPreferences::Apply(WebView* web_view) const {

23 WebSettings* settings = web_view->settings();	23 WebSettings* settings = web_view->settings();

(...skipping 59 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83 // and support is compiled in.	83 // and support is compiled in.

84 settings->setExperimentalWebGLEnabled(experimental_webgl_enabled);	84 settings->setExperimentalWebGLEnabled(experimental_webgl_enabled);

85	85

86 // Web inspector settings need to be passed in differently.	86 // Web inspector settings need to be passed in differently.

87 web_view->setInspectorSettings(WebString::fromUTF8(inspector_settings));	87 web_view->setInspectorSettings(WebString::fromUTF8(inspector_settings));

88	88

89 // Tabs to link is not part of the settings. WebCore calls	89 // Tabs to link is not part of the settings. WebCore calls

90 // ChromeClient::tabsToLinks which is part of the glue code.	90 // ChromeClient::tabsToLinks which is part of the glue code.

91 web_view->setTabsToLinks(tabs_to_links);	91 web_view->setTabsToLinks(tabs_to_links);

92 }	92 }

OLD	NEW

« no previous file with comments | « webkit/glue/webplugin_impl_unittest.cc ('k') | webkit/glue/websocketstreamhandle_impl.h » ('j') | no next file with comments »