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

Side by Side 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: Rebase 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 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 "chrome/browser/ui/browser_commands.h" 5 #include "chrome/browser/ui/browser_commands.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/bookmarks/bookmark_editor.h" 10 #include "chrome/browser/bookmarks/bookmark_editor.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "chrome/common/chrome_switches.h" 55 #include "chrome/common/chrome_switches.h"
56 #include "chrome/common/pref_names.h" 56 #include "chrome/common/pref_names.h"
57 #include "content/public/browser/devtools_agent_host_registry.h" 57 #include "content/public/browser/devtools_agent_host_registry.h"
58 #include "content/public/browser/navigation_controller.h" 58 #include "content/public/browser/navigation_controller.h"
59 #include "content/public/browser/navigation_entry.h" 59 #include "content/public/browser/navigation_entry.h"
60 #include "content/public/browser/page_navigator.h" 60 #include "content/public/browser/page_navigator.h"
61 #include "content/public/browser/render_view_host.h" 61 #include "content/public/browser/render_view_host.h"
62 #include "content/public/browser/user_metrics.h" 62 #include "content/public/browser/user_metrics.h"
63 #include "content/public/browser/web_contents.h" 63 #include "content/public/browser/web_contents.h"
64 #include "content/public/browser/web_contents_view.h" 64 #include "content/public/browser/web_contents_view.h"
65 #include "content/public/common/content_client.h"
65 #include "content/public/common/content_restriction.h" 66 #include "content/public/common/content_restriction.h"
66 #include "content/public/common/renderer_preferences.h" 67 #include "content/public/common/renderer_preferences.h"
67 #include "content/public/common/url_constants.h" 68 #include "content/public/common/url_constants.h"
68 #include "net/base/escape.h" 69 #include "net/base/escape.h"
70 #include "webkit/glue/user_agent.h"
69 #include "webkit/glue/webkit_glue.h" 71 #include "webkit/glue/webkit_glue.h"
70 72
71 #if defined(OS_MACOSX) 73 #if defined(OS_MACOSX)
72 #include "ui/base/cocoa/find_pasteboard.h" 74 #include "ui/base/cocoa/find_pasteboard.h"
73 #endif 75 #endif
74 76
75 #if defined(OS_WIN) 77 #if defined(OS_WIN)
76 #include "base/win/metro.h" 78 #include "base/win/metro.h"
77 #endif 79 #endif
78 80
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 859
858 void OpenUpdateChromeDialog(Browser* browser) { 860 void OpenUpdateChromeDialog(Browser* browser) {
859 content::RecordAction(UserMetricsAction("UpdateChrome")); 861 content::RecordAction(UserMetricsAction("UpdateChrome"));
860 browser->window()->ShowUpdateChromeDialog(); 862 browser->window()->ShowUpdateChromeDialog();
861 } 863 }
862 864
863 void ToggleSpeechInput(Browser* browser) { 865 void ToggleSpeechInput(Browser* browser) {
864 GetActiveWebContents(browser)->GetRenderViewHost()->ToggleSpeechInput(); 866 GetActiveWebContents(browser)->GetRenderViewHost()->ToggleSpeechInput();
865 } 867 }
866 868
869 void ToggleRequestTabletSite(Browser* browser)
870 {
sky 2012/08/06 21:41:06 { should be on previous line.
sschmitz 2012/08/07 02:19:49 Done.
871 // Note: The associated control is disabled when current_tab
sky 2012/08/06 21:41:06 This comment is misleading so you don't do that in
sschmitz 2012/08/07 02:19:49 Removed the comment. Some reorg. Done.
872 // or entry are NULL.
873 WebContents* current_tab = GetActiveWebContents(browser);
874 if (!current_tab)
875 return;
876 NavigationController& controller = current_tab->GetController();
877 NavigationEntry* entry = controller.GetActiveEntry();
878 if (!entry)
879 return;
880 if (entry->GetIsOverridingUserAgent()) {
881 entry->SetIsOverridingUserAgent(false);
882 } else {
883 entry->SetIsOverridingUserAgent(true);
884 current_tab->SetUserAgentOverride(
885 webkit_glue::BuildUserAgentOverrideForTabletSiteFromUserAgent(
886 content::GetUserAgent(entry->GetOriginalRequestURL())));
887 }
888 controller.Reload(true);
889 }
890
867 void ToggleFullscreenMode(Browser* browser) { 891 void ToggleFullscreenMode(Browser* browser) {
868 browser->fullscreen_controller()->ToggleFullscreenMode(); 892 browser->fullscreen_controller()->ToggleFullscreenMode();
869 } 893 }
870 894
871 void ClearCache(Browser* browser) { 895 void ClearCache(Browser* browser) {
872 BrowsingDataRemover* remover = new BrowsingDataRemover(browser->profile(), 896 BrowsingDataRemover* remover = new BrowsingDataRemover(browser->profile(),
873 BrowsingDataRemover::EVERYTHING, 897 BrowsingDataRemover::EVERYTHING,
874 base::Time()); 898 base::Time());
875 remover->Remove(BrowsingDataRemover::REMOVE_CACHE, 899 remover->Remove(BrowsingDataRemover::REMOVE_CACHE,
876 BrowsingDataHelper::UNPROTECTED_WEB); 900 BrowsingDataHelper::UNPROTECTED_WEB);
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 if (!tab_contents) 1013 if (!tab_contents)
990 tab_contents = new TabContents(contents); 1014 tab_contents = new TabContents(contents);
991 app_browser->tab_strip_model()->AppendTabContents(tab_contents, true); 1015 app_browser->tab_strip_model()->AppendTabContents(tab_contents, true);
992 1016
993 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; 1017 contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
994 contents->GetRenderViewHost()->SyncRendererPrefs(); 1018 contents->GetRenderViewHost()->SyncRendererPrefs();
995 app_browser->window()->Show(); 1019 app_browser->window()->Show();
996 } 1020 }
997 1021
998 } // namespace chrome 1022 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698