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

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: Rebasing Created 8 years, 3 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
« no previous file with comments | « chrome/browser/ui/browser_commands.h ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 4ebcfddc4a8dffabca0b07aebdefa461cec675ba..9c31248f60e98362f8ad700a218d867416b243d3 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -63,12 +63,14 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/browser/web_intents_dispatcher.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/web_intent_data.h"
#include "webkit/glue/webkit_glue.h"
+#include "webkit/user_agent/user_agent_util.h"
#if defined(OS_MACOSX)
#include "ui/base/cocoa/find_pasteboard.h"
@@ -78,6 +80,10 @@
#include "base/win/metro.h"
#endif
+namespace {
+const char kOsOverrideForTabletSite[] = "Linux; Android 4.0.3";
+}
+
using content::NavigationController;
using content::NavigationEntry;
using content::OpenURLParams;
@@ -869,6 +875,43 @@ void ToggleSpeechInput(Browser* browser) {
GetActiveWebContents(browser)->GetRenderViewHost()->ToggleSpeechInput();
}
+bool CanRequestTabletSite(WebContents* current_tab) {
+ if (!current_tab)
+ return false;
+ return current_tab->GetController().GetActiveEntry() != NULL;
+}
+
+bool IsRequestingTabletSite(Browser* browser) {
+ WebContents* current_tab = chrome::GetActiveWebContents(browser);
+ if (!current_tab)
+ return false;
+ content::NavigationEntry* entry =
+ current_tab->GetController().GetActiveEntry();
+ if (!entry)
+ return false;
+ return entry->GetIsOverridingUserAgent();
+}
+
+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::BuildUserAgentFromOSAndProduct(
+ kOsOverrideForTabletSite,
+ content::GetContentClient()->GetProduct()));
+ }
+ controller.ReloadOriginalRequestURL(true);
+}
+
void ToggleFullscreenMode(Browser* browser) {
browser->fullscreen_controller()->ToggleFullscreenMode();
}
« no previous file with comments | « chrome/browser/ui/browser_commands.h ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698