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: Rebase Created 6 years, 7 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') | net/base/network_change_notifier.h » ('J')

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 303 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
321 settings->setIgnoreMainFrameOverflowHiddenQuirk(	323 settings->setIgnoreMainFrameOverflowHiddenQuirk(

322 prefs.ignore_main_frame_overflow_hidden_quirk);	324 prefs.ignore_main_frame_overflow_hidden_quirk);

323 settings->setReportScreenSizeInPhysicalPixelsQuirk(	325 settings->setReportScreenSizeInPhysicalPixelsQuirk(

324 prefs.report_screen_size_in_physical_pixels_quirk);	326 prefs.report_screen_size_in_physical_pixels_quirk);

325 settings->setMainFrameClipsContent(false);	327 settings->setMainFrameClipsContent(false);

326 settings->setShrinksStandaloneImagesToFit(false);	328 settings->setShrinksStandaloneImagesToFit(false);

327 settings->setShrinksViewportContentToFit(true);	329 settings->setShrinksViewportContentToFit(true);

328 #endif	330 #endif

329	331

330 WebNetworkStateNotifier::setOnLine(prefs.is_online);	332 WebNetworkStateNotifier::setOnLine(prefs.is_online);

	333 WebNetworkStateNotifier::setWebConnectionType(

	334 NetConnectionTypeToWebConnectionType(prefs.connection_type));

331 settings->setPinchVirtualViewportEnabled(	335 settings->setPinchVirtualViewportEnabled(

332 prefs.pinch_virtual_viewport_enabled);	336 prefs.pinch_virtual_viewport_enabled);

333	337

334 settings->setPinchOverlayScrollbarThickness(	338 settings->setPinchOverlayScrollbarThickness(

335 prefs.pinch_overlay_scrollbar_thickness);	339 prefs.pinch_overlay_scrollbar_thickness);

336 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);	340 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);

337 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);	341 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);

338 }	342 }

339	343

340 } // namespace content	344 } // namespace content

OLD	NEW