Filter Web Store app from ChromeOS launcher according to policy.

chrome/browser/ui/app_list/apps_model_builder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/apps_model_builder.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/extension_app_item.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 
 using extensions::Extension;
 
 namespace {
 
 bool AppPrecedes(const ExtensionAppItem* app1, const ExtensionAppItem* app2) {
   const syncer::StringOrdinal& page1 = app1->GetPageOrdinal();
   const syncer::StringOrdinal& page2 = app2->GetPageOrdinal();
   if (page1.LessThan(page2))
@@ skipping 42 matching lines @@
 void AppsModelBuilder::Build() {
   DCHECK(model_ && model_->item_count() == 0);
 
   PopulateApps();
   HighlightApp();
 }
 
 void AppsModelBuilder::AddApps(const ExtensionSet* extensions, Apps* apps) {
   for (ExtensionSet::const_iterator app = extensions->begin();
        app != extensions->end(); ++app) {
-    if ((*app)->ShouldDisplayInAppLauncher())
+    // If it's the web store, check the policy.
+    bool blocked_by_policy =
+        (*app)->id() == extension_misc::kWebStoreAppId &&

[Joao da Silva, 2013/01/25 09:10:12]

#include "chrome/common/extensions/extension_constants.h"

[dconnelly, 2013/01/25 15:50:07]

Done.

+        profile_->GetPrefs()->GetBoolean(prefs::kHideWebStoreIcon);
+    if ((*app)->ShouldDisplayInAppLauncher() && !blocked_by_policy)

[Joao da Silva, 2013/01/25 09:10:12]

I suggest adding a new method to do these checks, so that here the code becomes:

if (ShouldDisplayInAppLauncher(*app))
  apps->push_back(...);

The new method checks for app->ShouldDisplayInAppLauncher and the policy.

There is also an enterprise webstore app, which has a different AppID; you
should also block extension_misc::kEnterpriseWebStoreAppId.

[dconnelly, 2013/01/25 15:50:07]

Done.

       apps->push_back(new ExtensionAppItem(profile_, *app, controller_));
   }
 }
 
 void AppsModelBuilder::PopulateApps() {
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   if (!service)
     return;
 
@@ skipping 149 matching lines @@
 
   ExtensionAppItem* prev = target_index > 0 ? GetAppAt(target_index - 1) : NULL;
   ExtensionAppItem* next = target_index + 1 < model_->item_count() ?
       GetAppAt(target_index + 1) : NULL;
   GetAppAt(target_index)->Move(prev, next);
 }
 
 void AppsModelBuilder::ListItemsChanged(size_t start, size_t count) {
   NOTREACHED();
 }