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

Side by Side Diff: chrome/browser/ui/browser_commands.cc

Issue 209353016: Turn off Task Manager should not break the build on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated base on Peter Kasting's comment Created 6 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
« no previous file with comments | « chrome/browser/extensions/api/processes/processes_api.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 1002
1003 void ToggleDevToolsWindow(Browser* browser, DevToolsToggleAction action) { 1003 void ToggleDevToolsWindow(Browser* browser, DevToolsToggleAction action) {
1004 if (action.type() == DevToolsToggleAction::kShowConsole) 1004 if (action.type() == DevToolsToggleAction::kShowConsole)
1005 content::RecordAction(UserMetricsAction("DevTools_ToggleConsole")); 1005 content::RecordAction(UserMetricsAction("DevTools_ToggleConsole"));
1006 else 1006 else
1007 content::RecordAction(UserMetricsAction("DevTools_ToggleWindow")); 1007 content::RecordAction(UserMetricsAction("DevTools_ToggleWindow"));
1008 DevToolsWindow::ToggleDevToolsWindow(browser, action); 1008 DevToolsWindow::ToggleDevToolsWindow(browser, action);
1009 } 1009 }
1010 1010
1011 bool CanOpenTaskManager() { 1011 bool CanOpenTaskManager() {
1012 #if defined(ENABLE_TASK_MANAGER)
1012 #if defined(OS_WIN) 1013 #if defined(OS_WIN)
1013 // In metro we can't display the task manager, as it is a native window. 1014 // In metro we can't display the task manager, as it is a native window.
1014 return !win8::IsSingleWindowMetroMode(); 1015 return !win8::IsSingleWindowMetroMode();
1015 #else 1016 #else
1016 return true; 1017 return true;
1017 #endif 1018 #endif
1019 #else
1020 return false;
1021 #endif
1018 } 1022 }
1019 1023
1020 void OpenTaskManager(Browser* browser) { 1024 void OpenTaskManager(Browser* browser) {
1025 #if defined(ENABLE_TASK_MANAGER)
1021 content::RecordAction(UserMetricsAction("TaskManager")); 1026 content::RecordAction(UserMetricsAction("TaskManager"));
1022 chrome::ShowTaskManager(browser); 1027 chrome::ShowTaskManager(browser);
1028 #else
1029 NOTREACHED();
1030 #endif // defined(ENABLE_TASK_MANAGER)
Peter Kasting 2014/03/25 21:30:11 Nit: No need for this EOL comment
1023 } 1031 }
1024 1032
1025 void OpenFeedbackDialog(Browser* browser) { 1033 void OpenFeedbackDialog(Browser* browser) {
1026 content::RecordAction(UserMetricsAction("Feedback")); 1034 content::RecordAction(UserMetricsAction("Feedback"));
1027 chrome::ShowFeedbackPage(browser, std::string(), std::string()); 1035 chrome::ShowFeedbackPage(browser, std::string(), std::string());
1028 } 1036 }
1029 1037
1030 void ToggleBookmarkBar(Browser* browser) { 1038 void ToggleBookmarkBar(Browser* browser) {
1031 content::RecordAction(UserMetricsAction("ShowBookmarksBar")); 1039 content::RecordAction(UserMetricsAction("ShowBookmarksBar"));
1032 ToggleBookmarkBarWhenVisible(browser->profile()); 1040 ToggleBookmarkBarWhenVisible(browser->profile());
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(), 1252 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(),
1245 browser->host_desktop_type())); 1253 browser->host_desktop_type()));
1246 app_browser->tab_strip_model()->AppendWebContents(contents, true); 1254 app_browser->tab_strip_model()->AppendWebContents(contents, true);
1247 1255
1248 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; 1256 contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
1249 contents->GetRenderViewHost()->SyncRendererPrefs(); 1257 contents->GetRenderViewHost()->SyncRendererPrefs();
1250 app_browser->window()->Show(); 1258 app_browser->window()->Show();
1251 } 1259 }
1252 1260
1253 } // namespace chrome 1261 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/processes/processes_api.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698