| Index: chrome/browser/background_mode_manager.cc
|
| diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc
|
| index 06e54395d9051feecf6f1a4b3737b07e5a780c73..b9cb9110455c1f2ae99e0209881be011ea966692 100644
|
| --- a/chrome/browser/background_mode_manager.cc
|
| +++ b/chrome/browser/background_mode_manager.cc
|
| @@ -498,6 +498,7 @@ void BackgroundModeManager::UpdateStatusTrayIconContextMenu() {
|
| menu->AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
|
| #endif
|
| }
|
| + menu->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
|
| menu->AddSeparator();
|
| int application_position = 0;
|
| context_menu_application_offset_ = menu->GetItemCount();
|
| @@ -541,7 +542,7 @@ void BackgroundModeManager::RemoveStatusTrayIcon() {
|
| }
|
|
|
| void BackgroundModeManager::ExecuteApplication(int item) {
|
| - DCHECK(item > 0 && item < static_cast<int>(applications_.size()));
|
| + DCHECK(item >= 0 && item < static_cast<int>(applications_.size()));
|
| Browser* browser = BrowserList::GetLastActive();
|
| if (!browser) {
|
| Browser::OpenEmptyWindow(profile_);
|
| @@ -553,16 +554,19 @@ void BackgroundModeManager::ExecuteApplication(int item) {
|
|
|
| void BackgroundModeManager::ExecuteCommand(int item) {
|
| switch (item) {
|
| + case IDC_ABOUT:
|
| + GetBrowserWindow()->OpenAboutChromeDialog();
|
| + break;
|
| case IDC_EXIT:
|
| UserMetrics::RecordAction(UserMetricsAction("Exit"), profile_);
|
| BrowserList::CloseAllBrowsersAndExit();
|
| break;
|
| - case IDC_ABOUT:
|
| - GetBrowserWindow()->OpenAboutChromeDialog();
|
| - break;
|
| case IDC_OPTIONS:
|
| GetBrowserWindow()->OpenOptionsDialog();
|
| break;
|
| + case IDC_TASK_MANAGER:
|
| + GetBrowserWindow()->OpenTaskManager();
|
| + break;
|
| default:
|
| ExecuteApplication(item);
|
| break;
|
|
|