content/renderer/web_preferences.cc - Issue 298803006: NetInfo V3 support for browser

Side by Side Diff: content/renderer/web_preferences.cc

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 | « content/renderer/render_thread_impl.cc ('k') | net/base/network_change_notifier.h » ('j') | no next file with comments »

OLD	NEW
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 "content/renderer/net_info_helper.h"

	9 #include "third_party/WebKit/public/platform/WebConnectionType.h"

8 #include "third_party/WebKit/public/platform/WebString.h"	10 #include "third_party/WebKit/public/platform/WebString.h"

9 #include "third_party/WebKit/public/platform/WebURL.h"	11 #include "third_party/WebKit/public/platform/WebURL.h"

10 #include "third_party/WebKit/public/web/WebKit.h"	12 #include "third_party/WebKit/public/web/WebKit.h"

11 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h"	13 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h"

12 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"	14 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"

13 #include "third_party/WebKit/public/web/WebSettings.h"	15 #include "third_party/WebKit/public/web/WebSettings.h"

14 #include "third_party/WebKit/public/web/WebView.h"	16 #include "third_party/WebKit/public/web/WebView.h"

15 #include "third_party/icu/source/common/unicode/uchar.h"	17 #include "third_party/icu/source/common/unicode/uchar.h"

16 #include "third_party/icu/source/common/unicode/uscript.h"	18 #include "third_party/icu/source/common/unicode/uscript.h"

17 #include "webkit/common/webpreferences.h"	19 #include "webkit/common/webpreferences.h"

(...skipping 300 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
318 settings->setIgnoreMainFrameOverflowHiddenQuirk(	320 settings->setIgnoreMainFrameOverflowHiddenQuirk(

319 prefs.ignore_main_frame_overflow_hidden_quirk);	321 prefs.ignore_main_frame_overflow_hidden_quirk);

320 settings->setReportScreenSizeInPhysicalPixelsQuirk(	322 settings->setReportScreenSizeInPhysicalPixelsQuirk(

321 prefs.report_screen_size_in_physical_pixels_quirk);	323 prefs.report_screen_size_in_physical_pixels_quirk);

322 settings->setMainFrameClipsContent(false);	324 settings->setMainFrameClipsContent(false);

323 settings->setShrinksStandaloneImagesToFit(false);	325 settings->setShrinksStandaloneImagesToFit(false);

324 settings->setShrinksViewportContentToFit(true);	326 settings->setShrinksViewportContentToFit(true);

325 #endif	327 #endif

326	328

327 WebNetworkStateNotifier::setOnLine(prefs.is_online);	329 WebNetworkStateNotifier::setOnLine(prefs.is_online);

	330 WebNetworkStateNotifier::setWebConnectionType(

	331 NetConnectionTypeToWebConnectionType(prefs.connection_type));

328 settings->setPinchVirtualViewportEnabled(	332 settings->setPinchVirtualViewportEnabled(

329 prefs.pinch_virtual_viewport_enabled);	333 prefs.pinch_virtual_viewport_enabled);

330	334

331 settings->setPinchOverlayScrollbarThickness(	335 settings->setPinchOverlayScrollbarThickness(

332 prefs.pinch_overlay_scrollbar_thickness);	336 prefs.pinch_overlay_scrollbar_thickness);

333 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);	337 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);

334 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);	338 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);

335 }	339 }

336	340

337 } // namespace content	341 } // namespace content

OLD	NEW