| Index: athena/extensions/extension_app_model_builder.cc
|
| diff --git a/athena/extensions/extension_app_model_builder.cc b/athena/extensions/extension_app_model_builder.cc
|
| index 0aa5c6e9ab54d1002f20f15e5406c4826af94553..a59dd7d1eaabfb8dc56a5e180fd4eaff7c4a9263 100644
|
| --- a/athena/extensions/extension_app_model_builder.cc
|
| +++ b/athena/extensions/extension_app_model_builder.cc
|
| @@ -20,43 +20,6 @@ namespace athena {
|
|
|
| namespace {
|
|
|
| -gfx::ImageSkia CreateFlatColorImage(SkColor color) {
|
| - SkBitmap bitmap;
|
| - bitmap.allocN32Pixels(extension_misc::EXTENSION_ICON_MEDIUM,
|
| - extension_misc::EXTENSION_ICON_MEDIUM);
|
| - bitmap.eraseColor(color);
|
| - return gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
|
| -}
|
| -
|
| -// Same dummy item.
|
| -class DummyItem : public app_list::AppListItem {
|
| - public:
|
| - DummyItem(const std::string& id,
|
| - const GURL& url,
|
| - SkColor color,
|
| - content::BrowserContext* browser_context)
|
| - : app_list::AppListItem(id),
|
| - url_(url),
|
| - browser_context_(browser_context) {
|
| -
|
| - SetIcon(CreateFlatColorImage(color), false /* has_shadow */);
|
| - SetName(id);
|
| - }
|
| -
|
| - private:
|
| - // Overridden from app_list::AppListItem:
|
| - virtual void Activate(int event_flags) OVERRIDE {
|
| - ActivityManager::Get()->AddActivity(
|
| - ActivityFactory::Get()->CreateWebActivity(
|
| - browser_context_, base::string16(), url_));
|
| - }
|
| -
|
| - GURL url_;
|
| - content::BrowserContext* browser_context_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(DummyItem);
|
| -};
|
| -
|
| class AppItem : public app_list::AppListItem {
|
| public:
|
| AppItem(scoped_refptr<const extensions::Extension> extension,
|
| @@ -111,20 +74,6 @@ void ExtensionAppModelBuilder::PopulateApps(app_list::AppListModel* model) {
|
| new AppItem(*iter, browser_context_)));
|
| }
|
| }
|
| -
|
| - model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
|
| - "mail", GURL("http://gmail.com/"), SK_ColorRED, browser_context_)));
|
| - model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
|
| - "calendar", GURL("https://calendar.google.com/"),
|
| - SK_ColorBLUE, browser_context_)));
|
| - model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
|
| - "video", GURL("http://youtube.com/"), SK_ColorGREEN, browser_context_)));
|
| - model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
|
| - "music", GURL("http://play.google.com/music"),
|
| - SK_ColorYELLOW, browser_context_)));
|
| - model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
|
| - "contact", GURL("https://www.google.com/contacts"),
|
| - SK_ColorCYAN, browser_context_)));
|
| }
|
|
|
| } // namespace athena
|
|
|