Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(730)

Side by Side Diff: chrome/browser/app_controller_mac.mm

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix a few things. Works@master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 chrome::OpenHelpWindow(lastProfile, chrome::HELP_SOURCE_MENU); 1095 chrome::OpenHelpWindow(lastProfile, chrome::HELP_SOURCE_MENU);
1096 break; 1096 break;
1097 case IDC_SHOW_SYNC_SETUP: 1097 case IDC_SHOW_SYNC_SETUP:
1098 if (Browser* browser = ActivateBrowser(lastProfile)) { 1098 if (Browser* browser = ActivateBrowser(lastProfile)) {
1099 chrome::ShowBrowserSignin(browser, signin::SOURCE_MENU); 1099 chrome::ShowBrowserSignin(browser, signin::SOURCE_MENU);
1100 } else { 1100 } else {
1101 chrome::OpenSyncSetupWindow(lastProfile, signin::SOURCE_MENU); 1101 chrome::OpenSyncSetupWindow(lastProfile, signin::SOURCE_MENU);
1102 } 1102 }
1103 break; 1103 break;
1104 case IDC_TASK_MANAGER: 1104 case IDC_TASK_MANAGER:
1105 content::RecordAction(UserMetricsAction("TaskManager")); 1105 chrome::OpenTaskManager(chrome::GetLastActiveBrowser());
1106 TaskManagerMac::Show();
1107 break; 1106 break;
1108 case IDC_OPTIONS: 1107 case IDC_OPTIONS:
1109 [self showPreferences:sender]; 1108 [self showPreferences:sender];
1110 break; 1109 break;
1111 } 1110 }
1112 } 1111 }
1113 1112
1114 // Run a (background) application in a new tab. 1113 // Run a (background) application in a new tab.
1115 - (void)executeApplication:(id)sender { 1114 - (void)executeApplication:(id)sender {
1116 NSInteger tag = [sender tag]; 1115 NSInteger tag = [sender tag];
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1580 1579
1581 //--------------------------------------------------------------------------- 1580 //---------------------------------------------------------------------------
1582 1581
1583 namespace app_controller_mac { 1582 namespace app_controller_mac {
1584 1583
1585 bool IsOpeningNewWindow() { 1584 bool IsOpeningNewWindow() {
1586 return g_is_opening_new_window; 1585 return g_is_opening_new_window;
1587 } 1586 }
1588 1587
1589 } // namespace app_controller_mac 1588 } // namespace app_controller_mac
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698