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

Unified Diff: ash/shell/app_list.cc

Issue 9559005: aura: Implement app list M19 mock. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nit in #2 Created 8 years, 10 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: ash/shell/app_list.cc
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index eaa4ffa1699fcded6a29b5d594deaa6bf2f2b6c6..f4f8bd6390ab00237e8c8d0848a8ba0f82888271 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/app_list/app_list_item_group_model.h"
#include "ash/app_list/app_list_item_model.h"
#include "ash/app_list/app_list_item_view.h"
#include "ash/app_list/app_list_model.h"
@@ -36,17 +35,16 @@ class WindowTypeLauncherItem : public ash::AppListItemModel {
static SkBitmap GetIcon(Type type) {
static const SkColor kColors[] = {
- SkColorSetA(SK_ColorRED, 0x4F),
- SkColorSetA(SK_ColorGREEN, 0x4F),
- SkColorSetA(SK_ColorBLUE, 0x4F),
- SkColorSetA(SK_ColorYELLOW, 0x4F),
- SkColorSetA(SK_ColorCYAN, 0x4F),
+ SK_ColorRED,
+ SK_ColorGREEN,
+ SK_ColorBLUE,
+ SK_ColorYELLOW,
+ SK_ColorCYAN,
};
+ const int kIconSize = 128;
SkBitmap icon;
- icon.setConfig(SkBitmap::kARGB_8888_Config,
- ash::AppListItemView::kIconSize,
- ash::AppListItemView::kIconSize);
+ icon.setConfig(SkBitmap::kARGB_8888_Config, kIconSize, kIconSize);
icon.allocPixels();
icon.eraseColor(kColors[static_cast<int>(type) % arraysize(kColors)]);
return icon;
@@ -111,6 +109,21 @@ class ExampleAppListViewDelegate : public ash::AppListViewDelegate {
ExampleAppListViewDelegate() {}
private:
+ // Overridden from ash::AppListViewDelegate:
+ virtual void BuildAppListModel(const std::string& query,
+ AppListModel* model) OVERRIDE {
+ for (int i = 0;
+ i < static_cast<int>(WindowTypeLauncherItem::LAST_TYPE);
+ ++i) {
+ WindowTypeLauncherItem::Type type =
+ static_cast<WindowTypeLauncherItem::Type>(i);
+
+ std::string title = WindowTypeLauncherItem::GetTitle(type);
+ if (title.find(query) != std::string::npos)
+ model->AddItem(new WindowTypeLauncherItem(type));
+ }
+ }
+
virtual void OnAppListItemActivated(ash::AppListItemModel* item,
int event_flags) OVERRIDE {
static_cast<WindowTypeLauncherItem*>(item)->Activate(event_flags);
@@ -119,33 +132,8 @@ class ExampleAppListViewDelegate : public ash::AppListViewDelegate {
DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate);
};
-ash::AppListItemGroupModel* CreateGroup(
- const std::string& title,
- WindowTypeLauncherItem::Type start_type,
- WindowTypeLauncherItem::Type end_type) {
- ash::AppListItemGroupModel* group =
- new ash::AppListItemGroupModel(title);
- for (int i = static_cast<int>(start_type);
- i < static_cast<int>(end_type);
- ++i) {
- WindowTypeLauncherItem::Type type =
- static_cast<WindowTypeLauncherItem::Type>(i);
- group->AddItem(new WindowTypeLauncherItem(type));
- }
- return group;
-}
-
} // namespace
-void BuildAppListModel(ash::AppListModel* model) {
- model->AddGroup(CreateGroup("Windows",
- WindowTypeLauncherItem::TOPLEVEL_WINDOW,
- WindowTypeLauncherItem::WIDGETS_WINDOW));
- model->AddGroup(CreateGroup("Samples",
- WindowTypeLauncherItem::WIDGETS_WINDOW,
- WindowTypeLauncherItem::LAST_TYPE));
-}
-
ash::AppListViewDelegate* CreateAppListViewDelegate() {
return new ExampleAppListViewDelegate;
}

Powered by Google App Engine
This is Rietveld 408576698