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

Unified Diff: chrome/browser/ui/views/ash/app_list/app_list_model_builder.h

Issue 10388032: Move app list from ash to ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: fix nits in #3 Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/ash/app_list/app_list_model_builder.h
===================================================================
--- chrome/browser/ui/views/ash/app_list/app_list_model_builder.h (revision 135932)
+++ chrome/browser/ui/views/ash/app_list/app_list_model_builder.h (working copy)
@@ -6,11 +6,14 @@
#define CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_APP_LIST_MODEL_BUILDER_H_
#pragma once
-#include "ash/app_list/app_list_model.h"
+#include <string>
+#include <vector>
+
#include "base/gtest_prod_util.h"
#include "base/string16.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
+#include "ui/app_list/app_list_model.h"
class Profile;
@@ -19,20 +22,20 @@
explicit AppListModelBuilder(Profile* profile);
virtual ~AppListModelBuilder();
- void SetModel(ash::AppListModel* model);
+ void SetModel(app_list::AppListModel* model);
// Populates the model.
void Build(const std::string& query);
private:
- typedef std::vector<ash::AppListItemModel*> Items;
+ typedef std::vector<app_list::AppListItemModel*> Items;
FRIEND_TEST_ALL_PREFIXES(AppListModelBuilderTest, GetExtensionApps);
FRIEND_TEST_ALL_PREFIXES(AppListModelBuilderTest, SortAndPopulateModel);
FRIEND_TEST_ALL_PREFIXES(AppListModelBuilderTest, InsertItemByTitle);
void SortAndPopulateModel(const Items& items);
- void InsertItemByTitle(ash::AppListItemModel* item);
+ void InsertItemByTitle(app_list::AppListItemModel* item);
void GetExtensionApps(const string16& query, Items* items);
void CreateSpecialItems();
@@ -57,7 +60,7 @@
// The model used by AppListView. It is passed in via SetModel and owned by
// AppListView.
- ash::AppListModel* model_;
+ app_list::AppListModel* model_;
// Number of special items in the model. Special items index should be ranged
// from [0, special_items_count_ - 1].

Powered by Google App Engine
This is Rietveld 408576698