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

Side by Side Diff: components/html_viewer/blink_settings_impl.cc

Issue 1415513002: Remove plumbing for inert-visual-viewport flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « chrome/browser/about_flags.cc ('k') | components/html_viewer/web_preferences.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/html_viewer/blink_settings_impl.h" 5 #include "components/html_viewer/blink_settings_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "components/html_viewer/web_preferences.h" 8 #include "components/html_viewer/web_preferences.h"
9 #include "third_party/WebKit/public/platform/WebString.h" 9 #include "third_party/WebKit/public/platform/WebString.h"
10 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h" 10 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 prefs.image_color_profiles_enabled); 291 prefs.image_color_profiles_enabled);
292 settings->setShouldRespectImageOrientation( 292 settings->setShouldRespectImageOrientation(
293 prefs.should_respect_image_orientation); 293 prefs.should_respect_image_orientation);
294 294
295 settings->setUnsafePluginPastingEnabled(false); 295 settings->setUnsafePluginPastingEnabled(false);
296 settings->setEditingBehavior( 296 settings->setEditingBehavior(
297 static_cast<blink::WebSettings::EditingBehavior>(prefs.editing_behavior)); 297 static_cast<blink::WebSettings::EditingBehavior>(prefs.editing_behavior));
298 298
299 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows); 299 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows);
300 300
301 settings->setInertVisualViewport(prefs.inert_visual_viewport);
302
303 // TODO(bokan): Remove once Blink side is gone. 301 // TODO(bokan): Remove once Blink side is gone.
304 settings->setInvertViewportScrollOrder(true); 302 settings->setInvertViewportScrollOrder(true);
305 303
306 settings->setViewportEnabled(prefs.viewport_enabled); 304 settings->setViewportEnabled(prefs.viewport_enabled);
307 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale); 305 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
308 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled); 306 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
309 settings->setMainFrameResizesAreOrientationChanges( 307 settings->setMainFrameResizesAreOrientationChanges(
310 prefs.main_frame_resizes_are_orientation_changes); 308 prefs.main_frame_resizes_are_orientation_changes);
311 309
312 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); 310 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled);
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 experimental_webgl_enabled_ = !command_line->HasSwitch(kDisableWebGLSwitch); 417 experimental_webgl_enabled_ = !command_line->HasSwitch(kDisableWebGLSwitch);
420 } 418 }
421 419
422 void BlinkSettingsImpl::ApplySettingsToWebView(blink::WebView* view) const { 420 void BlinkSettingsImpl::ApplySettingsToWebView(blink::WebView* view) const {
423 WebPreferences prefs; 421 WebPreferences prefs;
424 ApplySettings(view, prefs); 422 ApplySettings(view, prefs);
425 ApplyFontRendereringSettings(); 423 ApplyFontRendereringSettings();
426 } 424 }
427 425
428 } // namespace html_viewer 426 } // namespace html_viewer
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | components/html_viewer/web_preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698