OLD | NEW |
---|---|
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 Loading... | |
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) | |
1013 return false; | |
1014 #endif // defined(ENABLE_TASK_MANAGER) | |
1015 | |
1012 #if defined(OS_WIN) | 1016 #if defined(OS_WIN) |
1013 // In metro we can't display the task manager, as it is a native window. | 1017 // In metro we can't display the task manager, as it is a native window. |
1014 return !win8::IsSingleWindowMetroMode(); | 1018 return !win8::IsSingleWindowMetroMode(); |
1015 #else | 1019 #else |
1016 return true; | 1020 return true; |
1017 #endif | 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 #endif // defined(ENABLE_TASK_MANAGER) | |
miket_OOO
2014/03/24 23:23:26
I can't tell for sure from here, but is this bette
| |
1023 } | 1029 } |
1024 | 1030 |
1025 void OpenFeedbackDialog(Browser* browser) { | 1031 void OpenFeedbackDialog(Browser* browser) { |
1026 content::RecordAction(UserMetricsAction("Feedback")); | 1032 content::RecordAction(UserMetricsAction("Feedback")); |
1027 chrome::ShowFeedbackPage(browser, std::string(), std::string()); | 1033 chrome::ShowFeedbackPage(browser, std::string(), std::string()); |
1028 } | 1034 } |
1029 | 1035 |
1030 void ToggleBookmarkBar(Browser* browser) { | 1036 void ToggleBookmarkBar(Browser* browser) { |
1031 content::RecordAction(UserMetricsAction("ShowBookmarksBar")); | 1037 content::RecordAction(UserMetricsAction("ShowBookmarksBar")); |
1032 ToggleBookmarkBarWhenVisible(browser->profile()); | 1038 ToggleBookmarkBarWhenVisible(browser->profile()); |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1244 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(), | 1250 Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(), |
1245 browser->host_desktop_type())); | 1251 browser->host_desktop_type())); |
1246 app_browser->tab_strip_model()->AppendWebContents(contents, true); | 1252 app_browser->tab_strip_model()->AppendWebContents(contents, true); |
1247 | 1253 |
1248 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; | 1254 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; |
1249 contents->GetRenderViewHost()->SyncRendererPrefs(); | 1255 contents->GetRenderViewHost()->SyncRendererPrefs(); |
1250 app_browser->window()->Show(); | 1256 app_browser->window()->Show(); |
1251 } | 1257 } |
1252 | 1258 |
1253 } // namespace chrome | 1259 } // namespace chrome |
OLD | NEW |