diff options
| author | mukai <mukai@chromium.org> | 2014-10-13 12:30:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-13 19:30:52 +0000 |
| commit | ec683477d778661111feed85eb34a531f2bff480 (patch) | |
| tree | d40fb7975d9e7d93ed09fb1a347c2a350f2cceef /athena | |
| parent | 340d4610e3ebfbdac0cd37f3b52461ad28fd9d33 (diff) | |
| download | chromium_src-ec683477d778661111feed85eb34a531f2bff480.zip chromium_src-ec683477d778661111feed85eb34a531f2bff480.tar.gz chromium_src-ec683477d778661111feed85eb34a531f2bff480.tar.bz2 | |
Skips Chrome icon in Athena home card.
Invoking NTP is meaningless in Athena. See the bug for the details.
BUG=421677
R=oshima@chromium.org
Review URL: https://codereview.chromium.org/647643002
Cr-Commit-Position: refs/heads/master@{#299344}
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/extensions/extension_app_model_builder.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/athena/extensions/extension_app_model_builder.cc b/athena/extensions/extension_app_model_builder.cc index 461fd8a..92ee81f 100644 --- a/athena/extensions/extension_app_model_builder.cc +++ b/athena/extensions/extension_app_model_builder.cc @@ -20,6 +20,10 @@ namespace athena { namespace { +// Copied from chrome/common/extensions/extension_constants.h +// TODO(mukai): move constants to src/extensions +const char kChromeAppId[] = "mgndgikekgjfcpckkfioiadnlibdjbkf"; + class AppItem : public app_list::AppListItem { public: AppItem(scoped_refptr<const extensions::Extension> extension, @@ -68,8 +72,11 @@ void ExtensionAppModelBuilder::PopulateApps(app_list::AppListModel* model) { for (extensions::ExtensionSet::const_iterator iter = extensions.begin(); iter != extensions.end(); ++iter) { + // Chrome icon is currently disabled for homecard since it's not meaningful. + // http://crbug.com/421677 // TODO(mukai): use chrome/browser/extension_ui_util. - if ((*iter)->ShouldDisplayInAppLauncher()) { + if ((*iter)->ShouldDisplayInAppLauncher() && + (*iter)->id() != kChromeAppId) { model->AddItem(scoped_ptr<app_list::AppListItem>( new AppItem(*iter, browser_context_))); } |