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

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

Issue 126993002: Switch from CommandLine switch to WebPreferences to control Pepper 3D. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a bug jamesr pointed out Created 6 years, 11 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/common/webpreferences.h ('k') | no next file » | 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 "webkit/common/webpreferences.h" 5 #include "webkit/common/webpreferences.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "third_party/WebKit/public/web/WebSettings.h" 10 #include "third_party/WebKit/public/web/WebSettings.h"
(...skipping 30 matching lines...) Expand all
41 databases_enabled(false), 41 databases_enabled(false),
42 application_cache_enabled(false), 42 application_cache_enabled(false),
43 tabs_to_links(true), 43 tabs_to_links(true),
44 caret_browsing_enabled(false), 44 caret_browsing_enabled(false),
45 hyperlink_auditing_enabled(true), 45 hyperlink_auditing_enabled(true),
46 is_online(true), 46 is_online(true),
47 allow_universal_access_from_file_urls(false), 47 allow_universal_access_from_file_urls(false),
48 allow_file_access_from_file_urls(false), 48 allow_file_access_from_file_urls(false),
49 webaudio_enabled(false), 49 webaudio_enabled(false),
50 experimental_webgl_enabled(false), 50 experimental_webgl_enabled(false),
51 pepper_3d_enabled(false),
51 flash_3d_enabled(true), 52 flash_3d_enabled(true),
52 flash_stage3d_enabled(false), 53 flash_stage3d_enabled(false),
53 flash_stage3d_baseline_enabled(false), 54 flash_stage3d_baseline_enabled(false),
54 gl_multisampling_enabled(true), 55 gl_multisampling_enabled(true),
55 privileged_webgl_extensions_enabled(false), 56 privileged_webgl_extensions_enabled(false),
56 webgl_errors_to_console_enabled(true), 57 webgl_errors_to_console_enabled(true),
57 accelerated_compositing_for_overflow_scroll_enabled(false), 58 accelerated_compositing_for_overflow_scroll_enabled(false),
58 universal_accelerated_compositing_for_overflow_scroll_enabled(false), 59 universal_accelerated_compositing_for_overflow_scroll_enabled(false),
59 accelerated_compositing_for_scrollable_frames_enabled(false), 60 accelerated_compositing_for_scrollable_frames_enabled(false),
60 composited_scrolling_for_frames_enabled(false), 61 composited_scrolling_for_frames_enabled(false),
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 COMPILE_ASSERT_MATCHING_ENUMS( 180 COMPILE_ASSERT_MATCHING_ENUMS(
180 webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); 181 webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
181 COMPILE_ASSERT_MATCHING_ENUMS( 182 COMPILE_ASSERT_MATCHING_ENUMS(
182 webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); 183 webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
183 COMPILE_ASSERT_MATCHING_ENUMS( 184 COMPILE_ASSERT_MATCHING_ENUMS(
184 webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); 185 webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
185 COMPILE_ASSERT_MATCHING_ENUMS( 186 COMPILE_ASSERT_MATCHING_ENUMS(
186 webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid); 187 webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid);
187 188
188 } // namespace webkit_glue 189 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/common/webpreferences.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698