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

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

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 | « no previous file | ui/app_list/app_list_menu.cc » ('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 #ifndef UI_APP_LIST_APP_LIST_MENU_H_ 5 #ifndef UI_APP_LIST_APP_LIST_MENU_H_
6 #define UI_APP_LIST_APP_LIST_MENU_H_ 6 #define UI_APP_LIST_APP_LIST_MENU_H_
7 7
8 #include "ui/app_list/app_list_model.h" 8 #include "ui/app_list/app_list_model.h"
9 #include "ui/base/models/simple_menu_model.h" 9 #include "ui/base/models/simple_menu_model.h"
10 10
11 namespace app_list { 11 namespace app_list {
12 12
13 class AppListViewDelegate; 13 class AppListViewDelegate;
14 14
15 // Menu for the app list. This is shown in the top right hand corner of the 15 // Menu for the app list. This is shown in the top right hand corner of the
16 // app list. 16 // app list.
17 // TODO(benwells): We should consider moving this into Chrome. 17 // TODO(benwells): We should consider moving this into Chrome.
18 class AppListMenu : public ui::SimpleMenuModel::Delegate { 18 class AppListMenu : public ui::SimpleMenuModel::Delegate {
19 public: 19 public:
20 enum AppListMenuCommands { 20 enum AppListMenuCommands {
21 CURRENT_USER,
22 SHOW_SETTINGS, 21 SHOW_SETTINGS,
23 SHOW_HELP, 22 SHOW_HELP,
24 SHOW_FEEDBACK, 23 SHOW_FEEDBACK,
25 // |SELECT_PROFILE| must remain the last enum because values greater than 24 // |SELECT_PROFILE| must remain the last enum because values greater than
26 // |SELECT_PROFILE| are used to indicate a profile index. 25 // |SELECT_PROFILE| are used to indicate a profile index.
27 SELECT_PROFILE, 26 SELECT_PROFILE,
28 }; 27 };
29 28
30 AppListMenu( 29 AppListMenu(
31 AppListViewDelegate* delegate, 30 AppListViewDelegate* delegate,
(...skipping 15 matching lines...) Expand all
47 ui::SimpleMenuModel menu_model_; 46 ui::SimpleMenuModel menu_model_;
48 AppListViewDelegate* delegate_; 47 AppListViewDelegate* delegate_;
49 AppListModel::Users users_; 48 AppListModel::Users users_;
50 49
51 DISALLOW_COPY_AND_ASSIGN(AppListMenu); 50 DISALLOW_COPY_AND_ASSIGN(AppListMenu);
52 }; 51 };
53 52
54 } // namespace app_list 53 } // namespace app_list
55 54
56 #endif // UI_APP_LIST_APP_LIST_MENU_H_ 55 #endif // UI_APP_LIST_APP_LIST_MENU_H_
OLDNEW
« no previous file with comments | « no previous file | ui/app_list/app_list_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698