Reorder the app order.

Loaded app comes first, and then mock icons follow. Otherwise,
the loaded calculator app icon won't appear in the new design
because the new design has three icons for apps.

BUG=None
R=oshima@chromium.org
TEST=manually

Review URL: https://codereview.chromium.org/470713002

Cr-Commit-Position: refs/heads/master@{#289677}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289677 0039d316-1c4b-4281-b951-d872f2087c98

athena/content/content_app_model_builder.cc

@@ -107,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(
@@ -120,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