| 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 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1154 chrome::OpenExtensionsWindow(lastProfile); | 1154 chrome::OpenExtensionsWindow(lastProfile); |
| 1155 break; | 1155 break; |
| 1156 case IDC_HELP_PAGE_VIA_MENU: | 1156 case IDC_HELP_PAGE_VIA_MENU: |
| 1157 if (Browser* browser = ActivateBrowser(lastProfile)) | 1157 if (Browser* browser = ActivateBrowser(lastProfile)) |
| 1158 chrome::ShowHelp(browser, chrome::HELP_SOURCE_MENU); | 1158 chrome::ShowHelp(browser, chrome::HELP_SOURCE_MENU); |
| 1159 else | 1159 else |
| 1160 chrome::OpenHelpWindow(lastProfile, chrome::HELP_SOURCE_MENU); | 1160 chrome::OpenHelpWindow(lastProfile, chrome::HELP_SOURCE_MENU); |
| 1161 break; | 1161 break; |
| 1162 case IDC_SHOW_SYNC_SETUP: | 1162 case IDC_SHOW_SYNC_SETUP: |
| 1163 if (Browser* browser = ActivateBrowser(lastProfile)) { | 1163 if (Browser* browser = ActivateBrowser(lastProfile)) { |
| 1164 chrome::ShowBrowserSignin(browser, signin::SOURCE_MENU); | 1164 chrome::ShowBrowserSignin(browser, signin_metrics::SOURCE_MENU); |
| 1165 } else { | 1165 } else { |
| 1166 chrome::OpenSyncSetupWindow(lastProfile, signin::SOURCE_MENU); | 1166 chrome::OpenSyncSetupWindow(lastProfile, signin_metrics::SOURCE_MENU); |
| 1167 } | 1167 } |
| 1168 break; | 1168 break; |
| 1169 case IDC_TASK_MANAGER: | 1169 case IDC_TASK_MANAGER: |
| 1170 chrome::OpenTaskManager(NULL); | 1170 chrome::OpenTaskManager(NULL); |
| 1171 break; | 1171 break; |
| 1172 case IDC_OPTIONS: | 1172 case IDC_OPTIONS: |
| 1173 [self showPreferences:sender]; | 1173 [self showPreferences:sender]; |
| 1174 break; | 1174 break; |
| 1175 } | 1175 } |
| 1176 } | 1176 } |
| (...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1738 | 1738 |
| 1739 //--------------------------------------------------------------------------- | 1739 //--------------------------------------------------------------------------- |
| 1740 | 1740 |
| 1741 namespace app_controller_mac { | 1741 namespace app_controller_mac { |
| 1742 | 1742 |
| 1743 bool IsOpeningNewWindow() { | 1743 bool IsOpeningNewWindow() { |
| 1744 return g_is_opening_new_window; | 1744 return g_is_opening_new_window; |
| 1745 } | 1745 } |
| 1746 | 1746 |
| 1747 } // namespace app_controller_mac | 1747 } // namespace app_controller_mac |
| OLD | NEW |