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

Unified Diff: chrome/browser/ui/browser_commands.cc

Issue 10827146: crbug.com/127841 - Request Tablet Site on CB with touch screen. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: use ReloadOriginalRequestURL instead of Reload; impl. review comments from sky Created 8 years, 4 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: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 423efc915ea14d1bdfdb860592384f17b6eef198..dc8df9362c4b40d64a932fe48d2b4a87f31d05bf 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -62,10 +62,12 @@
#include "content/public/browser/user_metrics.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
+#include "content/public/common/content_client.h"
#include "content/public/common/content_restriction.h"
#include "content/public/common/renderer_preferences.h"
#include "content/public/common/url_constants.h"
#include "net/base/escape.h"
+#include "webkit/glue/user_agent.h"
#include "webkit/glue/webkit_glue.h"
#if defined(OS_MACOSX)
@@ -864,6 +866,36 @@ void ToggleSpeechInput(Browser* browser) {
GetActiveWebContents(browser)->GetRenderViewHost()->ToggleSpeechInput();
}
+void ToggleRequestTabletSite(Browser* browser) {
+ WebContents* current_tab = GetActiveWebContents(browser);
+ if (!current_tab)
+ return;
+ NavigationController& controller = current_tab->GetController();
+ NavigationEntry* entry = controller.GetActiveEntry();
+ if (!entry)
+ return;
+ if (entry->GetIsOverridingUserAgent()) {
+ entry->SetIsOverridingUserAgent(false);
+ } else {
+ entry->SetIsOverridingUserAgent(true);
+ current_tab->SetUserAgentOverride(
+ webkit_glue::BuildUserAgentOverrideForTabletSiteFromUserAgent(
+ content::GetUserAgent(entry->GetOriginalRequestURL())));
+ }
+ controller.ReloadOriginalRequestURL(true);
+}
+
+bool CanRequestTabletSite(Browser* browser) {
+ if (!browser)
+ return false;
+ WebContents* current_tab = GetActiveWebContents(browser);
+ if (!current_tab)
+ return false;
+ if (!current_tab->GetController().GetActiveEntry())
Charlie Reis 2012/08/13 20:38:46 nit: return !!current_tab->GetController().GetActi
sschmitz 2012/09/06 16:44:02 Done.
+ return false;
+ return true;
+}
+
void ToggleFullscreenMode(Browser* browser) {
browser->fullscreen_controller()->ToggleFullscreenMode();
}

Powered by Google App Engine
This is Rietveld 408576698