OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser.h" | 5 #include "chrome/browser/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <shellapi.h> | 8 #include <shellapi.h> |
9 #include <windows.h> | 9 #include <windows.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/autofill/autofill_manager.h" | 26 #include "chrome/browser/autofill/autofill_manager.h" |
27 #include "chrome/browser/bookmarks/bookmark_model.h" | 27 #include "chrome/browser/bookmarks/bookmark_model.h" |
28 #include "chrome/browser/bookmarks/bookmark_utils.h" | 28 #include "chrome/browser/bookmarks/bookmark_utils.h" |
29 #include "chrome/browser/browser_list.h" | 29 #include "chrome/browser/browser_list.h" |
30 #include "chrome/browser/browser_process.h" | 30 #include "chrome/browser/browser_process.h" |
31 #include "chrome/browser/browser_shutdown.h" | 31 #include "chrome/browser/browser_shutdown.h" |
32 #include "chrome/browser/browser_window.h" | 32 #include "chrome/browser/browser_window.h" |
33 #include "chrome/browser/browser_url_handler.h" | 33 #include "chrome/browser/browser_url_handler.h" |
34 #include "chrome/browser/character_encoding.h" | 34 #include "chrome/browser/character_encoding.h" |
35 #include "chrome/browser/debugger/devtools_manager.h" | 35 #include "chrome/browser/debugger/devtools_manager.h" |
| 36 #include "chrome/browser/debugger/devtools_toggle_action.h" |
36 #include "chrome/browser/debugger/devtools_window.h" | 37 #include "chrome/browser/debugger/devtools_window.h" |
37 #include "chrome/browser/dock_info.h" | 38 #include "chrome/browser/dock_info.h" |
38 #include "chrome/browser/dom_ui/filebrowse_ui.h" | 39 #include "chrome/browser/dom_ui/filebrowse_ui.h" |
39 #include "chrome/browser/download/download_item_model.h" | 40 #include "chrome/browser/download/download_item_model.h" |
40 #include "chrome/browser/download/download_manager.h" | 41 #include "chrome/browser/download/download_manager.h" |
41 #include "chrome/browser/download/download_shelf.h" | 42 #include "chrome/browser/download/download_shelf.h" |
42 #include "chrome/browser/download/download_started_animation.h" | 43 #include "chrome/browser/download/download_started_animation.h" |
43 #include "chrome/browser/extensions/crashed_extension_infobar.h" | 44 #include "chrome/browser/extensions/crashed_extension_infobar.h" |
44 #include "chrome/browser/extensions/extension_browser_event_router.h" | 45 #include "chrome/browser/extensions/extension_browser_event_router.h" |
45 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" | 46 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" |
(...skipping 1616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1662 pending_web_app_action_ = CREATE_SHORTCUT; | 1663 pending_web_app_action_ = CREATE_SHORTCUT; |
1663 | 1664 |
1664 // Start fetching web app info for CreateApplicationShortcut dialog and show | 1665 // Start fetching web app info for CreateApplicationShortcut dialog and show |
1665 // the dialog when the data is available in OnDidGetApplicationInfo. | 1666 // the dialog when the data is available in OnDidGetApplicationInfo. |
1666 current_tab->render_view_host()->GetApplicationInfo(entry->page_id()); | 1667 current_tab->render_view_host()->GetApplicationInfo(entry->page_id()); |
1667 #else | 1668 #else |
1668 NOTIMPLEMENTED(); | 1669 NOTIMPLEMENTED(); |
1669 #endif | 1670 #endif |
1670 } | 1671 } |
1671 | 1672 |
1672 void Browser::ToggleDevToolsWindow(bool open_console) { | 1673 void Browser::ToggleDevToolsWindow(DevToolsToggleAction action) { |
1673 if (open_console) | 1674 std::string uma_string; |
1674 UserMetrics::RecordAction(UserMetricsAction("DevTools_ToggleConsole"), | 1675 switch (action) { |
1675 profile_); | 1676 case DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE: |
1676 else | 1677 uma_string = "DevTools_ToggleConsole"; |
1677 UserMetrics::RecordAction(UserMetricsAction("DevTools_ToggleWindow"), | 1678 break; |
1678 profile_); | 1679 case DEVTOOLS_TOGGLE_ACTION_NONE: |
| 1680 case DEVTOOLS_TOGGLE_ACTION_INSPECT: |
| 1681 default: |
| 1682 uma_string = "DevTools_ToggleWindow"; |
| 1683 break; |
| 1684 } |
| 1685 UserMetrics::RecordAction(UserMetricsAction(uma_string.c_str()), profile_); |
1679 DevToolsManager::GetInstance()->ToggleDevToolsWindow( | 1686 DevToolsManager::GetInstance()->ToggleDevToolsWindow( |
1680 GetSelectedTabContents()->render_view_host(), open_console); | 1687 GetSelectedTabContents()->render_view_host(), action); |
1681 } | 1688 } |
1682 | 1689 |
1683 void Browser::OpenTaskManager() { | 1690 void Browser::OpenTaskManager() { |
1684 UserMetrics::RecordAction(UserMetricsAction("TaskManager"), profile_); | 1691 UserMetrics::RecordAction(UserMetricsAction("TaskManager"), profile_); |
1685 window_->ShowTaskManager(); | 1692 window_->ShowTaskManager(); |
1686 } | 1693 } |
1687 | 1694 |
1688 void Browser::OpenBugReportDialog() { | 1695 void Browser::OpenBugReportDialog() { |
1689 #if defined(OS_CHROMEOS) | 1696 #if defined(OS_CHROMEOS) |
1690 UserMetrics::RecordAction(UserMetricsAction("ReportBug"), profile_); | 1697 UserMetrics::RecordAction(UserMetricsAction("ReportBug"), profile_); |
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2078 case IDC_FOCUS_SEARCH: FocusSearch(); break; | 2085 case IDC_FOCUS_SEARCH: FocusSearch(); break; |
2079 case IDC_FOCUS_MENU_BAR: FocusPageAndAppMenus(); break; | 2086 case IDC_FOCUS_MENU_BAR: FocusPageAndAppMenus(); break; |
2080 case IDC_FOCUS_BOOKMARKS: FocusBookmarksToolbar(); break; | 2087 case IDC_FOCUS_BOOKMARKS: FocusBookmarksToolbar(); break; |
2081 case IDC_FOCUS_CHROMEOS_STATUS: FocusChromeOSStatus(); break; | 2088 case IDC_FOCUS_CHROMEOS_STATUS: FocusChromeOSStatus(); break; |
2082 case IDC_FOCUS_NEXT_PANE: FocusNextPane(); break; | 2089 case IDC_FOCUS_NEXT_PANE: FocusNextPane(); break; |
2083 case IDC_FOCUS_PREVIOUS_PANE: FocusPreviousPane(); break; | 2090 case IDC_FOCUS_PREVIOUS_PANE: FocusPreviousPane(); break; |
2084 | 2091 |
2085 // Show various bits of UI | 2092 // Show various bits of UI |
2086 case IDC_OPEN_FILE: OpenFile(); break; | 2093 case IDC_OPEN_FILE: OpenFile(); break; |
2087 case IDC_CREATE_SHORTCUTS: OpenCreateShortcutsDialog(); break; | 2094 case IDC_CREATE_SHORTCUTS: OpenCreateShortcutsDialog(); break; |
2088 case IDC_DEV_TOOLS: ToggleDevToolsWindow(false); break; | 2095 case IDC_DEV_TOOLS: ToggleDevToolsWindow( |
2089 case IDC_DEV_TOOLS_CONSOLE: ToggleDevToolsWindow(true); break; | 2096 DEVTOOLS_TOGGLE_ACTION_NONE); |
| 2097 break; |
| 2098 case IDC_DEV_TOOLS_CONSOLE: ToggleDevToolsWindow( |
| 2099 DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE); |
| 2100 break; |
| 2101 case IDC_DEV_TOOLS_INSPECT: ToggleDevToolsWindow( |
| 2102 DEVTOOLS_TOGGLE_ACTION_INSPECT); |
| 2103 break; |
2090 case IDC_TASK_MANAGER: OpenTaskManager(); break; | 2104 case IDC_TASK_MANAGER: OpenTaskManager(); break; |
2091 case IDC_REPORT_BUG: OpenBugReportDialog(); break; | 2105 case IDC_REPORT_BUG: OpenBugReportDialog(); break; |
2092 | 2106 |
2093 case IDC_SHOW_BOOKMARK_BAR: ToggleBookmarkBar(); break; | 2107 case IDC_SHOW_BOOKMARK_BAR: ToggleBookmarkBar(); break; |
2094 case IDC_SHOW_EXTENSION_SHELF: ToggleExtensionShelf(); break; | 2108 case IDC_SHOW_EXTENSION_SHELF: ToggleExtensionShelf(); break; |
2095 | 2109 |
2096 case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager(); break; | 2110 case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager(); break; |
2097 case IDC_SHOW_APP_MENU: ShowAppMenu(); break; | 2111 case IDC_SHOW_APP_MENU: ShowAppMenu(); break; |
2098 case IDC_SHOW_PAGE_MENU: ShowPageMenu(); break; | 2112 case IDC_SHOW_PAGE_MENU: ShowPageMenu(); break; |
2099 case IDC_SHOW_HISTORY: ShowHistoryTab(); break; | 2113 case IDC_SHOW_HISTORY: ShowHistoryTab(); break; |
(...skipping 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3157 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MENU, true); | 3171 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MENU, true); |
3158 command_updater_.UpdateCommandEnabled(IDC_ZOOM_PLUS, true); | 3172 command_updater_.UpdateCommandEnabled(IDC_ZOOM_PLUS, true); |
3159 command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true); | 3173 command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true); |
3160 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true); | 3174 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true); |
3161 | 3175 |
3162 // Show various bits of UI | 3176 // Show various bits of UI |
3163 command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, true); | 3177 command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, true); |
3164 command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false); | 3178 command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false); |
3165 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, true); | 3179 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, true); |
3166 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, true); | 3180 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, true); |
| 3181 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_INSPECT, true); |
3167 command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true); | 3182 command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true); |
3168 command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true); | 3183 command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true); |
3169 command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true); | 3184 command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true); |
3170 command_updater_.UpdateCommandEnabled(IDC_SHOW_EXTENSION_SHELF, true); | 3185 command_updater_.UpdateCommandEnabled(IDC_SHOW_EXTENSION_SHELF, true); |
3171 command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true); | 3186 command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true); |
3172 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true); | 3187 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true); |
3173 command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true); | 3188 command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true); |
3174 | 3189 |
3175 #if defined(OS_CHROMEOS) | 3190 #if defined(OS_CHROMEOS) |
3176 command_updater_.UpdateCommandEnabled(IDC_COMPACT_NAVBAR, true); | 3191 command_updater_.UpdateCommandEnabled(IDC_COMPACT_NAVBAR, true); |
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4033 } | 4048 } |
4034 | 4049 |
4035 bool Browser::IsPinned(TabContents* source) { | 4050 bool Browser::IsPinned(TabContents* source) { |
4036 int index = tabstrip_model_.GetIndexOfTabContents(source); | 4051 int index = tabstrip_model_.GetIndexOfTabContents(source); |
4037 if (index == TabStripModel::kNoTab) { | 4052 if (index == TabStripModel::kNoTab) { |
4038 NOTREACHED() << "IsPinned called for tab not in our strip"; | 4053 NOTREACHED() << "IsPinned called for tab not in our strip"; |
4039 return false; | 4054 return false; |
4040 } | 4055 } |
4041 return tabstrip_model_.IsTabPinned(index); | 4056 return tabstrip_model_.IsTabPinned(index); |
4042 } | 4057 } |
OLD | NEW |