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

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

Issue 1415513002: Remove plumbing for inert-visual-viewport flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Worked on review comments Created 5 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 prefs.image_color_profiles_enabled); 1038 prefs.image_color_profiles_enabled);
1039 settings->setShouldRespectImageOrientation( 1039 settings->setShouldRespectImageOrientation(
1040 prefs.should_respect_image_orientation); 1040 prefs.should_respect_image_orientation);
1041 1041
1042 settings->setUnsafePluginPastingEnabled(false); 1042 settings->setUnsafePluginPastingEnabled(false);
1043 settings->setEditingBehavior( 1043 settings->setEditingBehavior(
1044 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior)); 1044 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior));
1045 1045
1046 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows); 1046 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows);
1047 1047
1048 settings->setInertVisualViewport(prefs.inert_visual_viewport);
1049
1050 // TODO(bokan): Remove once Blink side is gone. 1048 // TODO(bokan): Remove once Blink side is gone.
1051 settings->setInvertViewportScrollOrder(true); 1049 settings->setInvertViewportScrollOrder(true);
1052 1050
1053 settings->setViewportEnabled(prefs.viewport_enabled); 1051 settings->setViewportEnabled(prefs.viewport_enabled);
1054 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale); 1052 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
1055 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled); 1053 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
1056 settings->setMainFrameResizesAreOrientationChanges( 1054 settings->setMainFrameResizesAreOrientationChanges(
1057 prefs.main_frame_resizes_are_orientation_changes); 1055 prefs.main_frame_resizes_are_orientation_changes);
1058 1056
1059 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); 1057 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled);
(...skipping 2630 matching lines...) Expand 10 before | Expand all | Expand 10 after
3690 std::vector<gfx::Size> sizes; 3688 std::vector<gfx::Size> sizes;
3691 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3689 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3692 if (!url.isEmpty()) 3690 if (!url.isEmpty())
3693 urls.push_back( 3691 urls.push_back(
3694 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3692 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3695 } 3693 }
3696 SendUpdateFaviconURL(urls); 3694 SendUpdateFaviconURL(urls);
3697 } 3695 }
3698 3696
3699 } // namespace content 3697 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698