Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / athena / content / content_app_model_builder.cc

diff --git a/src/athena/content/content_app_model_builder.cc b/src/athena/content/content_app_model_builder.cc
index 0f5eed7..a84d3c2 100644 (file)
--- a/src/athena/content/content_app_model_builder.cc
+++ b/src/athena/content/content_app_model_builder.cc
@@ -4,13 +4,13 @@
 
 #include "athena/content/public/content_app_model_builder.h"
 
-#include "apps/shell/browser/shell_extension_system.h"
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "extensions/browser/extension_icon_image.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
+#include "extensions/shell/browser/shell_extension_system.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
 
@@ -28,11 +28,8 @@ ShellExtensionSystem* GetShellExtensionSystem(
 
 gfx::ImageSkia CreateFlatColorImage(SkColor color) {
   SkBitmap bitmap;
-  bitmap.setConfig(
-      SkBitmap::kARGB_8888_Config,
-      extension_misc::EXTENSION_ICON_MEDIUM,
-      extension_misc::EXTENSION_ICON_MEDIUM);
-  bitmap.allocPixels();
+  bitmap.allocN32Pixels(extension_misc::EXTENSION_ICON_MEDIUM,
+                        extension_misc::EXTENSION_ICON_MEDIUM);
   bitmap.eraseColor(color);
   return gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
 }
@@ -110,6 +107,13 @@ ContentAppModelBuilder::~ContentAppModelBuilder() {
 }
 
 void ContentAppModelBuilder::PopulateApps(app_list::AppListModel* model) {
+  ShellExtensionSystem* extension_system =
+      GetShellExtensionSystem(browser_context_);
+  if (extension_system && extension_system->extension()) {
+    model->AddItem(scoped_ptr<app_list::AppListItem>(
+        new AppItem(extension_system->extension(), 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(
@@ -123,13 +127,6 @@ void ContentAppModelBuilder::PopulateApps(app_list::AppListModel* model) {
   model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
       "contact", GURL("https://www.google.com/contacts"),
       SK_ColorCYAN, browser_context_)));
-
-  ShellExtensionSystem* extension_system =
-      GetShellExtensionSystem(browser_context_);
-  if (extension_system && extension_system->extension()) {
-    model->AddItem(scoped_ptr<app_list::AppListItem>(
-        new AppItem(extension_system->extension(), browser_context_)));
-  }
 }
 
 }  // namespace athena