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

Side by Side Diff: webkit/common/webpreferences.h

Issue 298803006: NetInfo V3 support for browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore accidentally removed param traits Created 6 years, 6 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
« no previous file with comments | « net/base/network_change_notifier.h ('k') | webkit/common/webpreferences.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 // A struct for managing webkit's settings. 5 // A struct for managing webkit's settings.
6 // 6 //
7 // Adding new values to this class probably involves updating 7 // Adding new values to this class probably involves updating
8 // blink::WebSettings, content/common/view_messages.h, browser/tab_contents/ 8 // blink::WebSettings, content/common/view_messages.h, browser/tab_contents/
9 // render_view_host_delegate_helper.cc, and browser/profiles/profile.cc. 9 // render_view_host_delegate_helper.cc, and browser/profiles/profile.cc.
10 10
11 #ifndef WEBKIT_COMMON_WEBPREFERENCES_H__ 11 #ifndef WEBKIT_COMMON_WEBPREFERENCES_H__
12 #define WEBKIT_COMMON_WEBPREFERENCES_H__ 12 #define WEBKIT_COMMON_WEBPREFERENCES_H__
13 13
14 #include <map> 14 #include <map>
15 #include <string> 15 #include <string>
16 #include <vector> 16 #include <vector>
17 17
18 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
19 #include "net/base/network_change_notifier.h"
19 #include "url/gurl.h" 20 #include "url/gurl.h"
20 #include "webkit/common/webkit_common_export.h" 21 #include "webkit/common/webkit_common_export.h"
21 22
22 namespace blink { 23 namespace blink {
23 class WebView; 24 class WebView;
24 } 25 }
25 26
26 struct WebPreferences; 27 struct WebPreferences;
27 28
28 namespace webkit_glue { 29 namespace webkit_glue {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // we disable the feature at a lower layer so that we catch non-WebKit uses 86 // we disable the feature at a lower layer so that we catch non-WebKit uses
86 // of DNS prefetch as well. 87 // of DNS prefetch as well.
87 bool dns_prefetching_enabled; 88 bool dns_prefetching_enabled;
88 bool local_storage_enabled; 89 bool local_storage_enabled;
89 bool databases_enabled; 90 bool databases_enabled;
90 bool application_cache_enabled; 91 bool application_cache_enabled;
91 bool tabs_to_links; 92 bool tabs_to_links;
92 bool caret_browsing_enabled; 93 bool caret_browsing_enabled;
93 bool hyperlink_auditing_enabled; 94 bool hyperlink_auditing_enabled;
94 bool is_online; 95 bool is_online;
96 net::NetworkChangeNotifier::ConnectionType connection_type;
95 bool allow_universal_access_from_file_urls; 97 bool allow_universal_access_from_file_urls;
96 bool allow_file_access_from_file_urls; 98 bool allow_file_access_from_file_urls;
97 bool webaudio_enabled; 99 bool webaudio_enabled;
98 bool experimental_webgl_enabled; 100 bool experimental_webgl_enabled;
99 bool pepper_3d_enabled; 101 bool pepper_3d_enabled;
100 bool flash_3d_enabled; 102 bool flash_3d_enabled;
101 bool flash_stage3d_enabled; 103 bool flash_stage3d_enabled;
102 bool flash_stage3d_baseline_enabled; 104 bool flash_stage3d_baseline_enabled;
103 bool gl_multisampling_enabled; 105 bool gl_multisampling_enabled;
104 bool privileged_webgl_extensions_enabled; 106 bool privileged_webgl_extensions_enabled;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 #endif 184 #endif
183 185
184 // We try to keep the default values the same as the default values in 186 // We try to keep the default values the same as the default values in
185 // chrome, except for the cases where it would require lots of extra work for 187 // chrome, except for the cases where it would require lots of extra work for
186 // the embedder to use the same default value. 188 // the embedder to use the same default value.
187 WebPreferences(); 189 WebPreferences();
188 ~WebPreferences(); 190 ~WebPreferences();
189 }; 191 };
190 192
191 #endif // WEBKIT_COMMON_WEBPREFERENCES_H__ 193 #endif // WEBKIT_COMMON_WEBPREFERENCES_H__
OLDNEW
« no previous file with comments | « net/base/network_change_notifier.h ('k') | webkit/common/webpreferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698