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

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

Issue 20656002: Add profile selector menu to app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, remove dead code in app_list_menu_views, add ui assets Created 7 years, 3 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
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_strings.h" 8 #include "grit/ui_strings.h"
8 #include "ui/app_list/app_list_view_delegate.h" 9 #include "ui/app_list/app_list_view_delegate.h"
9 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/base/models/menu_separator_types.h" 11 #include "ui/base/models/menu_separator_types.h"
11 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
12 13
13 namespace app_list { 14 namespace app_list {
14 15
15 AppListMenu::AppListMenu(AppListViewDelegate* delegate) 16 AppListMenu::AppListMenu(AppListViewDelegate* delegate,
17 const AppListModel::Users& users)
16 : menu_model_(this), 18 : menu_model_(this),
17 delegate_(delegate) { 19 delegate_(delegate),
20 users_(users) {
18 InitMenu(); 21 InitMenu();
19 } 22 }
20 23
21 AppListMenu::~AppListMenu() {} 24 AppListMenu::~AppListMenu() {}
22 25
23 void AppListMenu::InitMenu() { 26 void AppListMenu::InitMenu() {
24 menu_model_.AddItem(CURRENT_USER, base::string16()); 27 // User selector menu section.
tapted 2013/09/10 00:29:26 nit: perhaps mention that when there is exactly 1
calamity 2013/09/10 22:50:46 Done.
25 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); 28 if (users_.size() > 1) {
29 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
30 for (size_t i = 0; i < users_.size(); ++i) {
31 menu_model_.AddItem(SELECT_PROFILE + i, users_[i]->name);
32 menu_model_.SetSublabel(i, users_[i]->email);
tapted 2013/09/10 00:29:26 You should do int menu_index = GetIndexOfCommandI
calamity 2013/09/10 22:50:46 Done. What was GetSublabelAt() for?
33 if (users_[i]->active) {
tapted 2013/09/10 00:29:26 Also, why not IsCommandIdChecked? Maybe a comment
calamity 2013/09/10 22:50:46 Done.
34 menu_model_.SetIcon(i, gfx::Image(*rb.GetImageSkiaNamed(
35 IDR_APP_LIST_CURRENT_USER_INDICATOR)));
36 }
37 }
38 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
39 }
26 40
27 menu_model_.AddItem(SHOW_SETTINGS, l10n_util::GetStringUTF16( 41 menu_model_.AddItem(SHOW_SETTINGS, l10n_util::GetStringUTF16(
28 IDS_APP_LIST_OPEN_SETTINGS)); 42 IDS_APP_LIST_OPEN_SETTINGS));
29 43
30 menu_model_.AddItem(SHOW_HELP, l10n_util::GetStringUTF16( 44 menu_model_.AddItem(SHOW_HELP, l10n_util::GetStringUTF16(
31 IDS_APP_LIST_HELP)); 45 IDS_APP_LIST_HELP));
32 46
33 menu_model_.AddItem(SHOW_FEEDBACK, l10n_util::GetStringUTF16( 47 menu_model_.AddItem(SHOW_FEEDBACK, l10n_util::GetStringUTF16(
34 IDS_APP_LIST_OPEN_FEEDBACK)); 48 IDS_APP_LIST_OPEN_FEEDBACK));
35 } 49 }
36 50
37 bool AppListMenu::IsCommandIdChecked(int command_id) const { 51 bool AppListMenu::IsCommandIdChecked(int command_id) const {
38 return false; 52 return false;
39 } 53 }
40 54
41 bool AppListMenu::IsCommandIdEnabled(int command_id) const { 55 bool AppListMenu::IsCommandIdEnabled(int command_id) const {
42 return true; 56 return true;
43 } 57 }
44 58
45 bool AppListMenu::GetAcceleratorForCommandId(int command_id, 59 bool AppListMenu::GetAcceleratorForCommandId(int command_id,
46 ui::Accelerator* accelerator) { 60 ui::Accelerator* accelerator) {
47 return false; 61 return false;
48 } 62 }
49 63
50 void AppListMenu::ExecuteCommand(int command_id, int event_flags) { 64 void AppListMenu::ExecuteCommand(int command_id, int event_flags) {
65 if (command_id >= SELECT_PROFILE) {
66 delegate_->ShowForProfileByPath(
67 users_[command_id - SELECT_PROFILE]->profile_path);
68 return;
69 }
51 switch (command_id) { 70 switch (command_id) {
52 case CURRENT_USER: 71 case CURRENT_USER:
53 break; // Do nothing. 72 break; // Do nothing.
54 case SHOW_SETTINGS: 73 case SHOW_SETTINGS:
55 delegate_->OpenSettings(); 74 delegate_->OpenSettings();
56 break; 75 break;
57 case SHOW_HELP: 76 case SHOW_HELP:
58 delegate_->OpenHelp(); 77 delegate_->OpenHelp();
59 break; 78 break;
60 case SHOW_FEEDBACK: 79 case SHOW_FEEDBACK:
61 delegate_->OpenFeedback(); 80 delegate_->OpenFeedback();
62 break; 81 break;
63 default: 82 default:
64 NOTREACHED(); 83 NOTREACHED();
65 } 84 }
66 } 85 }
67 86
68 } // namespace app_list 87 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698