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

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

Issue 225263004: Delete "Experimental WebSocket" flag from chrome://flags. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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 | « 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 viewport_enabled(false), 108 viewport_enabled(false),
109 viewport_meta_enabled(false), 109 viewport_meta_enabled(false),
110 main_frame_resizes_are_orientation_changes(false), 110 main_frame_resizes_are_orientation_changes(false),
111 initialize_at_minimum_page_scale(true), 111 initialize_at_minimum_page_scale(true),
112 #if defined(OS_MACOSX) 112 #if defined(OS_MACOSX)
113 smart_insert_delete_enabled(true), 113 smart_insert_delete_enabled(true),
114 #else 114 #else
115 smart_insert_delete_enabled(false), 115 smart_insert_delete_enabled(false),
116 #endif 116 #endif
117 spatial_navigation_enabled(false), 117 spatial_navigation_enabled(false),
118 experimental_websocket_enabled(false),
119 pinch_virtual_viewport_enabled(false), 118 pinch_virtual_viewport_enabled(false),
120 pinch_overlay_scrollbar_thickness(0), 119 pinch_overlay_scrollbar_thickness(0),
121 use_solid_color_scrollbars(false), 120 use_solid_color_scrollbars(false),
122 compositor_touch_hit_testing(true), 121 compositor_touch_hit_testing(true),
123 navigate_on_drag_drop(true), 122 navigate_on_drag_drop(true),
124 cookie_enabled(true), 123 cookie_enabled(true),
125 pepper_accelerated_video_decode_enabled(false) 124 pepper_accelerated_video_decode_enabled(false)
126 #if defined(OS_ANDROID) 125 #if defined(OS_ANDROID)
127 , 126 ,
128 text_autosizing_enabled(true), 127 text_autosizing_enabled(true),
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 COMPILE_ASSERT_MATCHING_ENUMS( 175 COMPILE_ASSERT_MATCHING_ENUMS(
177 webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); 176 webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
178 COMPILE_ASSERT_MATCHING_ENUMS( 177 COMPILE_ASSERT_MATCHING_ENUMS(
179 webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); 178 webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
180 COMPILE_ASSERT_MATCHING_ENUMS( 179 COMPILE_ASSERT_MATCHING_ENUMS(
181 webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); 180 webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
182 COMPILE_ASSERT_MATCHING_ENUMS( 181 COMPILE_ASSERT_MATCHING_ENUMS(
183 webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid); 182 webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid);
184 183
185 } // namespace webkit_glue 184 } // 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