OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #import "chrome/browser/app_controller_mac.h" | 5 #import "chrome/browser/app_controller_mac.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1119 chrome::OpenExtensionsWindow(lastProfile); | 1119 chrome::OpenExtensionsWindow(lastProfile); |
1120 break; | 1120 break; |
1121 case IDC_HELP_PAGE_VIA_MENU: | 1121 case IDC_HELP_PAGE_VIA_MENU: |
1122 if (Browser* browser = ActivateBrowser(lastProfile)) | 1122 if (Browser* browser = ActivateBrowser(lastProfile)) |
1123 chrome::ShowHelp(browser, chrome::HELP_SOURCE_MENU); | 1123 chrome::ShowHelp(browser, chrome::HELP_SOURCE_MENU); |
1124 else | 1124 else |
1125 chrome::OpenHelpWindow(lastProfile, chrome::HELP_SOURCE_MENU); | 1125 chrome::OpenHelpWindow(lastProfile, chrome::HELP_SOURCE_MENU); |
1126 break; | 1126 break; |
1127 case IDC_SHOW_SYNC_SETUP: | 1127 case IDC_SHOW_SYNC_SETUP: |
1128 if (Browser* browser = ActivateBrowser(lastProfile)) { | 1128 if (Browser* browser = ActivateBrowser(lastProfile)) { |
1129 chrome::ShowBrowserSigninOrSettings(browser, | 1129 chrome::ShowBrowserSigninOrSettings( |
1130 signin_metrics::SOURCE_MENU); | 1130 browser, signin_metrics::AccessPoint::ACCESS_POINT_MENU); |
1131 } else { | 1131 } else { |
1132 chrome::OpenSyncSetupWindow(lastProfile, signin_metrics::SOURCE_MENU); | 1132 chrome::OpenSyncSetupWindow( |
| 1133 lastProfile, signin_metrics::AccessPoint::ACCESS_POINT_MENU); |
1133 } | 1134 } |
1134 break; | 1135 break; |
1135 case IDC_TASK_MANAGER: | 1136 case IDC_TASK_MANAGER: |
1136 chrome::OpenTaskManager(NULL); | 1137 chrome::OpenTaskManager(NULL); |
1137 break; | 1138 break; |
1138 case IDC_OPTIONS: | 1139 case IDC_OPTIONS: |
1139 [self showPreferences:sender]; | 1140 [self showPreferences:sender]; |
1140 break; | 1141 break; |
1141 } | 1142 } |
1142 } | 1143 } |
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1701 | 1702 |
1702 //--------------------------------------------------------------------------- | 1703 //--------------------------------------------------------------------------- |
1703 | 1704 |
1704 namespace app_controller_mac { | 1705 namespace app_controller_mac { |
1705 | 1706 |
1706 bool IsOpeningNewWindow() { | 1707 bool IsOpeningNewWindow() { |
1707 return g_is_opening_new_window; | 1708 return g_is_opening_new_window; |
1708 } | 1709 } |
1709 | 1710 |
1710 } // namespace app_controller_mac | 1711 } // namespace app_controller_mac |
OLD | NEW |