| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
| 10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
| (...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 935 } | 935 } |
| 936 // TODO(akalin): Add a constant to denote starting sync from the | 936 // TODO(akalin): Add a constant to denote starting sync from the |
| 937 // main menu and use that instead of START_FROM_WRENCH. | 937 // main menu and use that instead of START_FROM_WRENCH. |
| 938 sync_ui_util::OpenSyncMyBookmarksDialog( | 938 sync_ui_util::OpenSyncMyBookmarksDialog( |
| 939 defaultProfile, ActivateBrowser(defaultProfile), | 939 defaultProfile, ActivateBrowser(defaultProfile), |
| 940 ProfileSyncService::START_FROM_WRENCH); | 940 ProfileSyncService::START_FROM_WRENCH); |
| 941 break; | 941 break; |
| 942 case IDC_TASK_MANAGER: | 942 case IDC_TASK_MANAGER: |
| 943 UserMetrics::RecordAction(UserMetricsAction("TaskManager"), | 943 UserMetrics::RecordAction(UserMetricsAction("TaskManager"), |
| 944 defaultProfile); | 944 defaultProfile); |
| 945 TaskManagerMac::Show(); | 945 TaskManagerMac::Show(false); |
| 946 break; | 946 break; |
| 947 case IDC_OPTIONS: | 947 case IDC_OPTIONS: |
| 948 [self showPreferences:sender]; | 948 [self showPreferences:sender]; |
| 949 break; | 949 break; |
| 950 default: | 950 default: |
| 951 // Background Applications use dynamic values that must be less than the | 951 // Background Applications use dynamic values that must be less than the |
| 952 // smallest value among the predefined IDC_* labels. | 952 // smallest value among the predefined IDC_* labels. |
| 953 if ([sender tag] < IDC_MinimumLabelValue) | 953 if ([sender tag] < IDC_MinimumLabelValue) |
| 954 [self executeApplication:sender]; | 954 [self executeApplication:sender]; |
| 955 break; | 955 break; |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1289 [appController showPreferencesWindow:nil page:page profile:profile]; | 1289 [appController showPreferencesWindow:nil page:page profile:profile]; |
| 1290 } | 1290 } |
| 1291 | 1291 |
| 1292 namespace app_controller_mac { | 1292 namespace app_controller_mac { |
| 1293 | 1293 |
| 1294 bool IsOpeningNewWindow() { | 1294 bool IsOpeningNewWindow() { |
| 1295 return g_is_opening_new_window; | 1295 return g_is_opening_new_window; |
| 1296 } | 1296 } |
| 1297 | 1297 |
| 1298 } // namespace app_controller_mac | 1298 } // namespace app_controller_mac |
| OLD | NEW |