Commit ec683477 authored by mukai's avatar mukai Committed by Commit bot

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}
parent 340d4610
...@@ -20,6 +20,10 @@ namespace athena { ...@@ -20,6 +20,10 @@ namespace athena {
namespace { 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 { class AppItem : public app_list::AppListItem {
public: public:
AppItem(scoped_refptr<const extensions::Extension> extension, AppItem(scoped_refptr<const extensions::Extension> extension,
...@@ -68,8 +72,11 @@ void ExtensionAppModelBuilder::PopulateApps(app_list::AppListModel* model) { ...@@ -68,8 +72,11 @@ void ExtensionAppModelBuilder::PopulateApps(app_list::AppListModel* model) {
for (extensions::ExtensionSet::const_iterator iter = extensions.begin(); for (extensions::ExtensionSet::const_iterator iter = extensions.begin();
iter != extensions.end(); iter != extensions.end();
++iter) { ++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. // TODO(mukai): use chrome/browser/extension_ui_util.
if ((*iter)->ShouldDisplayInAppLauncher()) { if ((*iter)->ShouldDisplayInAppLauncher() &&
(*iter)->id() != kChromeAppId) {
model->AddItem(scoped_ptr<app_list::AppListItem>( model->AddItem(scoped_ptr<app_list::AppListItem>(
new AppItem(*iter, browser_context_))); new AppItem(*iter, browser_context_)));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment