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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable HandheldFriendlyMeta and MobileOptimizedMeta as well Created 4 years, 9 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/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 2153 matching lines...) Expand 10 before | Expand all | Expand 10 after
2164 } 2164 }
2165 2165
2166 void WebContentsImpl::SetIsVirtualKeyboardRequested(bool requested) { 2166 void WebContentsImpl::SetIsVirtualKeyboardRequested(bool requested) {
2167 virtual_keyboard_requested_ = requested; 2167 virtual_keyboard_requested_ = requested;
2168 } 2168 }
2169 2169
2170 bool WebContentsImpl::IsVirtualKeyboardRequested() { 2170 bool WebContentsImpl::IsVirtualKeyboardRequested() {
2171 return virtual_keyboard_requested_; 2171 return virtual_keyboard_requested_;
2172 } 2172 }
2173 2173
2174 bool WebContentsImpl::IsOverridingUserAgent() {
2175 return GetController().GetVisibleEntry() &&
2176 GetController().GetVisibleEntry()->GetIsOverridingUserAgent();
2177 }
2178
2174 AccessibilityMode WebContentsImpl::GetAccessibilityMode() const { 2179 AccessibilityMode WebContentsImpl::GetAccessibilityMode() const {
2175 return accessibility_mode_; 2180 return accessibility_mode_;
2176 } 2181 }
2177 2182
2178 void WebContentsImpl::AccessibilityEventReceived( 2183 void WebContentsImpl::AccessibilityEventReceived(
2179 const std::vector<AXEventNotificationDetails>& details) { 2184 const std::vector<AXEventNotificationDetails>& details) {
2180 FOR_EACH_OBSERVER( 2185 FOR_EACH_OBSERVER(
2181 WebContentsObserver, observers_, AccessibilityEventReceived(details)); 2186 WebContentsObserver, observers_, AccessibilityEventReceived(details));
2182 } 2187 }
2183 2188
(...skipping 2656 matching lines...) Expand 10 before | Expand all | Expand 10 after
4840 } 4845 }
4841 if (visible == should_normally_be_visible_) 4846 if (visible == should_normally_be_visible_)
4842 return; 4847 return;
4843 4848
4844 if (visible) 4849 if (visible)
4845 WasShown(); 4850 WasShown();
4846 else 4851 else
4847 WasHidden(); 4852 WasHidden();
4848 } 4853 }
4849 4854
4855 void WebContentsImpl::UpdateOverridingUserAgent() {
4856 GetRenderViewHost()->OnWebkitPreferencesChanged();
nasko 2016/03/18 21:05:25 This doesn't seem compatible with out-of-process i
aelias_OOO_until_Jul13 2016/03/18 22:49:18 The enableViewportMeta setting only ever has an ef
nasko 2016/03/25 23:29:05 But this is method that calls for overriding user
aelias_OOO_until_Jul13 2016/04/07 03:06:14 OK, I changed to loop through the FrameTreeNodes (
4857 }
4858
4850 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 4859 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
4851 JavaScriptDialogManager* dialog_manager) { 4860 JavaScriptDialogManager* dialog_manager) {
4852 dialog_manager_ = dialog_manager; 4861 dialog_manager_ = dialog_manager;
4853 } 4862 }
4854 4863
4855 } // namespace content 4864 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698