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

Unified Diff: ui/app_list/app_list_menu.h

Issue 63283003: Move AppListModel::Users to AppListViewDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mac fixes Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/app_list.gyp ('k') | ui/app_list/app_list_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/app_list_menu.h
diff --git a/ui/app_list/app_list_menu.h b/ui/app_list/app_list_menu.h
index fa42b936d1db5480b604e34127f57fa3201e1f0f..6520e1d5904bea93882a6fab80e7be43bcbcbe07 100644
--- a/ui/app_list/app_list_menu.h
+++ b/ui/app_list/app_list_menu.h
@@ -5,13 +5,11 @@
#ifndef UI_APP_LIST_APP_LIST_MENU_H_
#define UI_APP_LIST_APP_LIST_MENU_H_
-#include "ui/app_list/app_list_model.h"
+#include "ui/app_list/app_list_view_delegate.h"
#include "ui/base/models/simple_menu_model.h"
namespace app_list {
-class AppListViewDelegate;
-
// Menu for the app list. This is shown in the top right hand corner of the
// app list.
// TODO(benwells): We should consider moving this into Chrome.
@@ -26,9 +24,7 @@ class AppListMenu : public ui::SimpleMenuModel::Delegate {
SELECT_PROFILE,
};
- AppListMenu(
- AppListViewDelegate* delegate,
- const AppListModel::Users& users);
+ explicit AppListMenu(AppListViewDelegate* delegate);
virtual ~AppListMenu();
ui::SimpleMenuModel* menu_model() { return &menu_model_; }
@@ -45,7 +41,7 @@ class AppListMenu : public ui::SimpleMenuModel::Delegate {
ui::SimpleMenuModel menu_model_;
AppListViewDelegate* delegate_;
- AppListModel::Users users_;
+ AppListViewDelegate::Users users_;
DISALLOW_COPY_AND_ASSIGN(AppListMenu);
};
« no previous file with comments | « ui/app_list/app_list.gyp ('k') | ui/app_list/app_list_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698