Index: athena/content/content_app_model_builder.cc |
diff --git a/athena/content/content_app_model_builder.cc b/athena/content/content_app_model_builder.cc |
index d8a361615bb02b206970f497a5e5eaaf79948c17..a84d3c2901f44ca753cf220dbd584c2b77ceb640 100644 |
--- a/athena/content/content_app_model_builder.cc |
+++ b/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 |