| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 #include "chrome/browser/google_util.h" | 55 #include "chrome/browser/google_util.h" |
| 56 #include "chrome/browser/host_zoom_map.h" | 56 #include "chrome/browser/host_zoom_map.h" |
| 57 #include "chrome/browser/location_bar.h" | 57 #include "chrome/browser/location_bar.h" |
| 58 #include "chrome/browser/metrics/user_metrics.h" | 58 #include "chrome/browser/metrics/user_metrics.h" |
| 59 #include "chrome/browser/net/browser_url_util.h" | 59 #include "chrome/browser/net/browser_url_util.h" |
| 60 #include "chrome/browser/net/url_fixer_upper.h" | 60 #include "chrome/browser/net/url_fixer_upper.h" |
| 61 #include "chrome/browser/options_window.h" | 61 #include "chrome/browser/options_window.h" |
| 62 #include "chrome/browser/platform_util.h" | 62 #include "chrome/browser/platform_util.h" |
| 63 #include "chrome/browser/pref_service.h" | 63 #include "chrome/browser/pref_service.h" |
| 64 #include "chrome/browser/profile.h" | 64 #include "chrome/browser/profile.h" |
| 65 #if defined(ENABLE_REMOTING) |
| 66 #include "chrome/browser/remoting/setup.h" |
| 67 #endif |
| 65 #include "chrome/browser/renderer_host/render_view_host.h" | 68 #include "chrome/browser/renderer_host/render_view_host.h" |
| 66 #include "chrome/browser/renderer_host/site_instance.h" | 69 #include "chrome/browser/renderer_host/site_instance.h" |
| 67 #include "chrome/browser/sessions/session_service.h" | 70 #include "chrome/browser/sessions/session_service.h" |
| 68 #include "chrome/browser/sessions/session_types.h" | 71 #include "chrome/browser/sessions/session_types.h" |
| 69 #include "chrome/browser/status_bubble.h" | 72 #include "chrome/browser/status_bubble.h" |
| 70 #include "chrome/browser/sync/profile_sync_service.h" | 73 #include "chrome/browser/sync/profile_sync_service.h" |
| 71 #include "chrome/browser/sync/sync_ui_util.h" | 74 #include "chrome/browser/sync/sync_ui_util.h" |
| 72 #include "chrome/browser/tab_closeable_state_watcher.h" | 75 #include "chrome/browser/tab_closeable_state_watcher.h" |
| 73 #include "chrome/browser/tab_contents/interstitial_page.h" | 76 #include "chrome/browser/tab_contents/interstitial_page.h" |
| 74 #include "chrome/browser/tab_contents/navigation_controller.h" | 77 #include "chrome/browser/tab_contents/navigation_controller.h" |
| (...skipping 987 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1062 command_updater_.UpdateCommandEnabled( | 1065 command_updater_.UpdateCommandEnabled( |
| 1063 IDC_FOCUS_CHROMEOS_STATUS, main_not_fullscreen_or_popup); | 1066 IDC_FOCUS_CHROMEOS_STATUS, main_not_fullscreen_or_popup); |
| 1064 | 1067 |
| 1065 // Show various bits of UI | 1068 // Show various bits of UI |
| 1066 command_updater_.UpdateCommandEnabled(IDC_DEVELOPER_MENU, show_main_ui); | 1069 command_updater_.UpdateCommandEnabled(IDC_DEVELOPER_MENU, show_main_ui); |
| 1067 command_updater_.UpdateCommandEnabled(IDC_REPORT_BUG, show_main_ui); | 1070 command_updater_.UpdateCommandEnabled(IDC_REPORT_BUG, show_main_ui); |
| 1068 command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR, show_main_ui); | 1071 command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR, show_main_ui); |
| 1069 command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, show_main_ui); | 1072 command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, show_main_ui); |
| 1070 command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS, | 1073 command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS, |
| 1071 show_main_ui && profile_->IsSyncAccessible()); | 1074 show_main_ui && profile_->IsSyncAccessible()); |
| 1075 |
| 1076 #if defined(ENABLE_REMOTING) |
| 1077 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableRemoting)) { |
| 1078 command_updater_.UpdateCommandEnabled(IDC_REMOTING_SETUP, show_main_ui); |
| 1079 } |
| 1080 #endif |
| 1081 |
| 1072 command_updater_.UpdateCommandEnabled(IDC_OPTIONS, show_main_ui); | 1082 command_updater_.UpdateCommandEnabled(IDC_OPTIONS, show_main_ui); |
| 1073 command_updater_.UpdateCommandEnabled(IDC_EDIT_SEARCH_ENGINES, show_main_ui); | 1083 command_updater_.UpdateCommandEnabled(IDC_EDIT_SEARCH_ENGINES, show_main_ui); |
| 1074 command_updater_.UpdateCommandEnabled(IDC_VIEW_PASSWORDS, show_main_ui); | 1084 command_updater_.UpdateCommandEnabled(IDC_VIEW_PASSWORDS, show_main_ui); |
| 1075 command_updater_.UpdateCommandEnabled(IDC_ABOUT, show_main_ui); | 1085 command_updater_.UpdateCommandEnabled(IDC_ABOUT, show_main_ui); |
| 1076 command_updater_.UpdateCommandEnabled(IDC_SHOW_APP_MENU, show_main_ui); | 1086 command_updater_.UpdateCommandEnabled(IDC_SHOW_APP_MENU, show_main_ui); |
| 1077 command_updater_.UpdateCommandEnabled(IDC_TOGGLE_VERTICAL_TABS, show_main_ui); | 1087 command_updater_.UpdateCommandEnabled(IDC_TOGGLE_VERTICAL_TABS, show_main_ui); |
| 1078 } | 1088 } |
| 1079 | 1089 |
| 1080 bool Browser::OpenAppsPanelAsNewTab() { | 1090 bool Browser::OpenAppsPanelAsNewTab() { |
| 1081 #if defined(OS_CHROMEOS) || defined(OS_WIN) | 1091 #if defined(OS_CHROMEOS) || defined(OS_WIN) |
| (...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1812 void Browser::OpenImportSettingsDialog() { | 1822 void Browser::OpenImportSettingsDialog() { |
| 1813 UserMetrics::RecordAction(UserMetricsAction("Import_ShowDlg"), profile_); | 1823 UserMetrics::RecordAction(UserMetricsAction("Import_ShowDlg"), profile_); |
| 1814 window_->ShowImportDialog(); | 1824 window_->ShowImportDialog(); |
| 1815 } | 1825 } |
| 1816 | 1826 |
| 1817 void Browser::OpenSyncMyBookmarksDialog() { | 1827 void Browser::OpenSyncMyBookmarksDialog() { |
| 1818 sync_ui_util::OpenSyncMyBookmarksDialog( | 1828 sync_ui_util::OpenSyncMyBookmarksDialog( |
| 1819 profile_, ProfileSyncService::START_FROM_WRENCH); | 1829 profile_, ProfileSyncService::START_FROM_WRENCH); |
| 1820 } | 1830 } |
| 1821 | 1831 |
| 1832 #if defined(ENABLE_REMOTING) |
| 1833 void Browser::OpenRemotingSetupDialog() { |
| 1834 remoting_setup::OpenRemotingSetupDialog(profile_); |
| 1835 } |
| 1836 #endif |
| 1837 |
| 1822 void Browser::OpenAboutChromeDialog() { | 1838 void Browser::OpenAboutChromeDialog() { |
| 1823 UserMetrics::RecordAction(UserMetricsAction("AboutChrome"), profile_); | 1839 UserMetrics::RecordAction(UserMetricsAction("AboutChrome"), profile_); |
| 1824 window_->ShowAboutChromeDialog(); | 1840 window_->ShowAboutChromeDialog(); |
| 1825 } | 1841 } |
| 1826 | 1842 |
| 1827 void Browser::OpenUpdateChromeDialog() { | 1843 void Browser::OpenUpdateChromeDialog() { |
| 1828 UserMetrics::RecordAction(UserMetricsAction("UpdateChrome"), profile_); | 1844 UserMetrics::RecordAction(UserMetricsAction("UpdateChrome"), profile_); |
| 1829 window_->ShowUpdateChromeDialog(); | 1845 window_->ShowUpdateChromeDialog(); |
| 1830 } | 1846 } |
| 1831 | 1847 |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2104 | 2120 |
| 2105 case IDC_SHOW_BOOKMARK_BAR: ToggleBookmarkBar(); break; | 2121 case IDC_SHOW_BOOKMARK_BAR: ToggleBookmarkBar(); break; |
| 2106 case IDC_SHOW_EXTENSION_SHELF: ToggleExtensionShelf(); break; | 2122 case IDC_SHOW_EXTENSION_SHELF: ToggleExtensionShelf(); break; |
| 2107 | 2123 |
| 2108 case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager(); break; | 2124 case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager(); break; |
| 2109 case IDC_SHOW_APP_MENU: ShowAppMenu(); break; | 2125 case IDC_SHOW_APP_MENU: ShowAppMenu(); break; |
| 2110 case IDC_SHOW_HISTORY: ShowHistoryTab(); break; | 2126 case IDC_SHOW_HISTORY: ShowHistoryTab(); break; |
| 2111 case IDC_SHOW_DOWNLOADS: ShowDownloadsTab(); break; | 2127 case IDC_SHOW_DOWNLOADS: ShowDownloadsTab(); break; |
| 2112 case IDC_MANAGE_EXTENSIONS: ShowExtensionsTab(); break; | 2128 case IDC_MANAGE_EXTENSIONS: ShowExtensionsTab(); break; |
| 2113 case IDC_SYNC_BOOKMARKS: OpenSyncMyBookmarksDialog(); break; | 2129 case IDC_SYNC_BOOKMARKS: OpenSyncMyBookmarksDialog(); break; |
| 2130 #if defined(ENABLE_REMOTING) |
| 2131 case IDC_REMOTING_SETUP: OpenRemotingSetupDialog(); break; |
| 2132 #endif |
| 2114 case IDC_OPTIONS: OpenOptionsDialog(); break; | 2133 case IDC_OPTIONS: OpenOptionsDialog(); break; |
| 2115 case IDC_EDIT_SEARCH_ENGINES: OpenKeywordEditor(); break; | 2134 case IDC_EDIT_SEARCH_ENGINES: OpenKeywordEditor(); break; |
| 2116 case IDC_VIEW_PASSWORDS: OpenPasswordManager(); break; | 2135 case IDC_VIEW_PASSWORDS: OpenPasswordManager(); break; |
| 2117 case IDC_CLEAR_BROWSING_DATA: OpenClearBrowsingDataDialog(); break; | 2136 case IDC_CLEAR_BROWSING_DATA: OpenClearBrowsingDataDialog(); break; |
| 2118 case IDC_IMPORT_SETTINGS: OpenImportSettingsDialog(); break; | 2137 case IDC_IMPORT_SETTINGS: OpenImportSettingsDialog(); break; |
| 2119 case IDC_ABOUT: | 2138 case IDC_ABOUT: |
| 2120 if (Singleton<UpgradeDetector>::get()->notify_upgrade()) | 2139 if (Singleton<UpgradeDetector>::get()->notify_upgrade()) |
| 2121 OpenUpdateChromeDialog(); | 2140 OpenUpdateChromeDialog(); |
| 2122 else | 2141 else |
| 2123 OpenAboutChromeDialog(); | 2142 OpenAboutChromeDialog(); |
| (...skipping 1951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4075 } | 4094 } |
| 4076 | 4095 |
| 4077 bool Browser::IsPinned(TabContents* source) { | 4096 bool Browser::IsPinned(TabContents* source) { |
| 4078 int index = tabstrip_model_.GetIndexOfTabContents(source); | 4097 int index = tabstrip_model_.GetIndexOfTabContents(source); |
| 4079 if (index == TabStripModel::kNoTab) { | 4098 if (index == TabStripModel::kNoTab) { |
| 4080 NOTREACHED() << "IsPinned called for tab not in our strip"; | 4099 NOTREACHED() << "IsPinned called for tab not in our strip"; |
| 4081 return false; | 4100 return false; |
| 4082 } | 4101 } |
| 4083 return tabstrip_model_.IsTabPinned(index); | 4102 return tabstrip_model_.IsTabPinned(index); |
| 4084 } | 4103 } |
| OLD | NEW |