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

Unified 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: Fix more tests 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 17e4875da9c03244cd432c0eb68f07a05241f8d9..0790c38d4e4239f334418928e04310b6c7caffa7 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2167,6 +2167,11 @@ bool WebContentsImpl::IsVirtualKeyboardRequested() {
return virtual_keyboard_requested_;
}
+bool WebContentsImpl::IsOverridingUserAgent() {
+ return GetController().GetVisibleEntry() &&
+ GetController().GetVisibleEntry()->GetIsOverridingUserAgent();
+}
+
AccessibilityMode WebContentsImpl::GetAccessibilityMode() const {
return accessibility_mode_;
}
@@ -4855,6 +4860,10 @@ void WebContentsImpl::UpdateWebContentsVisibility(bool visible) {
WasHidden();
}
+void WebContentsImpl::UpdateOverridingUserAgent() {
+ GetRenderViewHost()->OnWebkitPreferencesChanged();
+}
+
void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
JavaScriptDialogManager* dialog_manager) {
dialog_manager_ = dialog_manager;

Powered by Google App Engine
This is Rietveld 408576698