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

Unified 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 based on Mlket'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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/processes/processes_api.cc ('k') | no next file » | 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 de82e31324840c45892150c346eb4fc338e64f30..2c28aa1de70655b2bf5d5f9dbbee19b8a564558b 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -1009,6 +1009,10 @@ void ToggleDevToolsWindow(Browser* browser, DevToolsToggleAction action) {
}
bool CanOpenTaskManager() {
+#if !defined(ENABLE_TASK_MANAGER)
+ return false;
+#endif // defined(ENABLE_TASK_MANAGER)
Peter Kasting 2014/03/25 20:48:43 You can't do this; this will trigger an unreachabl
+
#if defined(OS_WIN)
// In metro we can't display the task manager, as it is a native window.
return !win8::IsSingleWindowMetroMode();
@@ -1018,8 +1022,12 @@ bool CanOpenTaskManager() {
}
void OpenTaskManager(Browser* browser) {
+#if defined(ENABLE_TASK_MANAGER)
content::RecordAction(UserMetricsAction("TaskManager"));
chrome::ShowTaskManager(browser);
+#else
+ NOTREACHED();
+#endif // defined(ENABLE_TASK_MANAGER)
}
void OpenFeedbackDialog(Browser* browser) {
« 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