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

Side by Side Diff: content/renderer/web_preferences.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 | « content/public/common/content_switches.cc ('k') | webkit/common/webpreferences.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 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 "content/public/renderer/web_preferences.h" 5 #include "content/public/renderer/web_preferences.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "third_party/WebKit/public/platform/WebString.h" 8 #include "third_party/WebKit/public/platform/WebString.h"
9 #include "third_party/WebKit/public/platform/WebURL.h" 9 #include "third_party/WebKit/public/platform/WebURL.h"
10 #include "third_party/WebKit/public/web/WebKit.h" 10 #include "third_party/WebKit/public/web/WebKit.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 prefs.clobber_user_agent_initial_scale_quirk); 343 prefs.clobber_user_agent_initial_scale_quirk);
344 settings->setIgnoreMainFrameOverflowHiddenQuirk( 344 settings->setIgnoreMainFrameOverflowHiddenQuirk(
345 prefs.ignore_main_frame_overflow_hidden_quirk); 345 prefs.ignore_main_frame_overflow_hidden_quirk);
346 settings->setReportScreenSizeInPhysicalPixelsQuirk( 346 settings->setReportScreenSizeInPhysicalPixelsQuirk(
347 prefs.report_screen_size_in_physical_pixels_quirk); 347 prefs.report_screen_size_in_physical_pixels_quirk);
348 settings->setMainFrameClipsContent(false); 348 settings->setMainFrameClipsContent(false);
349 settings->setShrinksStandaloneImagesToFit(false); 349 settings->setShrinksStandaloneImagesToFit(false);
350 #endif 350 #endif
351 351
352 WebNetworkStateNotifier::setOnLine(prefs.is_online); 352 WebNetworkStateNotifier::setOnLine(prefs.is_online);
353 settings->setExperimentalWebSocketEnabled(
354 prefs.experimental_websocket_enabled);
355 settings->setPinchVirtualViewportEnabled( 353 settings->setPinchVirtualViewportEnabled(
356 prefs.pinch_virtual_viewport_enabled); 354 prefs.pinch_virtual_viewport_enabled);
357 355
358 settings->setPinchOverlayScrollbarThickness( 356 settings->setPinchOverlayScrollbarThickness(
359 prefs.pinch_overlay_scrollbar_thickness); 357 prefs.pinch_overlay_scrollbar_thickness);
360 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 358 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
361 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing); 359 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);
362 } 360 }
363 361
364 } // namespace content 362 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | webkit/common/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698