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

Side by Side Diff: ui/app_list/app_list_menu.cc

Issue 25535006: Fix rebuilding the profile selector on the OSX App Launcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add setModel:NULL - destroying the C++ object is guaranteed, but not the menuController_ Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/app_list/app_list_menu.h ('k') | ui/app_list/cocoa/apps_search_box_controller.mm » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "ui/app_list/app_list_menu.h" 5 #include "ui/app_list/app_list_menu.h"
6 6
7 #include "grit/ui_resources.h" 7 #include "grit/ui_resources.h"
8 #include "grit/ui_strings.h" 8 #include "grit/ui_strings.h"
9 #include "ui/app_list/app_list_view_delegate.h" 9 #include "ui/app_list/app_list_view_delegate.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 return false; 76 return false;
77 } 77 }
78 78
79 void AppListMenu::ExecuteCommand(int command_id, int event_flags) { 79 void AppListMenu::ExecuteCommand(int command_id, int event_flags) {
80 if (command_id >= SELECT_PROFILE) { 80 if (command_id >= SELECT_PROFILE) {
81 delegate_->ShowForProfileByPath( 81 delegate_->ShowForProfileByPath(
82 users_[command_id - SELECT_PROFILE].profile_path); 82 users_[command_id - SELECT_PROFILE].profile_path);
83 return; 83 return;
84 } 84 }
85 switch (command_id) { 85 switch (command_id) {
86 case CURRENT_USER:
87 break; // Do nothing.
88 case SHOW_SETTINGS: 86 case SHOW_SETTINGS:
89 delegate_->OpenSettings(); 87 delegate_->OpenSettings();
90 break; 88 break;
91 case SHOW_HELP: 89 case SHOW_HELP:
92 delegate_->OpenHelp(); 90 delegate_->OpenHelp();
93 break; 91 break;
94 case SHOW_FEEDBACK: 92 case SHOW_FEEDBACK:
95 delegate_->OpenFeedback(); 93 delegate_->OpenFeedback();
96 break; 94 break;
97 default: 95 default:
98 NOTREACHED(); 96 NOTREACHED();
99 } 97 }
100 } 98 }
101 99
102 } // namespace app_list 100 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/app_list_menu.h ('k') | ui/app_list/cocoa/apps_search_box_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698