Add a policy to hide the Web Store on new tabs.

chrome/browser/ui/webui/ntp/app_launcher_handler.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/webui/ntp/app_launcher_handler.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 43 matching lines @@
 #include "ui/gfx/favicon_size.h"
 #include "ui/webui/web_ui_util.h"
 
 using chrome::AppLaunchParams;
 using chrome::OpenApplication;
 using content::WebContents;
 using extensions::CrxInstaller;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 
+namespace {
+
+bool ShouldDisplayInNewTabPage(const Extension* app, PrefService* prefs) {
+  bool blocked_by_policy =
+    (app->id() == extension_misc::kWebStoreAppId ||
+     app->id() == extension_misc::kEnterpriseWebStoreAppId) &&
+    prefs->GetBoolean(prefs::kHideWebStoreIcon);
+  return app->ShouldDisplayInNewTabPage() && !blocked_by_policy;
+}
+
+}  // namespace
+
 const net::UnescapeRule::Type kUnescapeRules =
     net::UnescapeRule::NORMAL | net::UnescapeRule::URL_SPECIAL_CHARS;
 
 AppLauncherHandler::AppInstallInfo::AppInstallInfo() {}
 
 AppLauncherHandler::AppInstallInfo::~AppInstallInfo() {}
 
 AppLauncherHandler::AppLauncherHandler(ExtensionService* extension_service)
     : extension_service_(extension_service),
       ignore_changes_(false),
@@ skipping 256 matching lines @@
     default:
       NOTREACHED();
   }
 }
 
 void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) {
   // CreateAppInfo and ClearOrdinals can change the extension prefs.
   base::AutoReset<bool> auto_reset(&ignore_changes_, true);
 
   ListValue* list = new ListValue();
+  PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
 
   for (std::set<std::string>::iterator it = visible_apps_.begin();
        it != visible_apps_.end(); ++it) {
     const Extension* extension = extension_service_->GetInstalledExtension(*it);
-    if (extension && extension->ShouldDisplayInNewTabPage()) {
+    if (extension && ShouldDisplayInNewTabPage(extension, prefs)) {

[Dan Beam, 2013/02/15 23:50:27]

I don't see the diff to remove ::ShouldDisplayInNewTabPage from the old location
-- where is this?

[dconnelly, 2013/02/18 09:35:54]

That's still in the Extension class (chrome/common/extensions/extension.h).  I
didn't remove or change it there because it's a property of the extension from
its JSON manifest, and I thought this policy-testing should be here in the
presentation logic.  I added the above  ShouldDisplayInNewTabPage function that
tests against the policy.  If you think the policy-testing logic should go in
the Extension class I'll move it.

       DictionaryValue* app_info = GetAppInfo(extension);
       list->Append(app_info);
     }
   }
 
   dictionary->Set("apps", list);
 
   // TODO(estade): remove these settings when the old NTP is removed. The new
   // NTP does it in js.
 #if defined(OS_MACOSX)
   // App windows are not yet implemented on mac.
   dictionary->SetBoolean("disableAppWindowLaunch", true);
   dictionary->SetBoolean("disableCreateAppShortcut", true);
 #endif
 
 #if defined(OS_CHROMEOS)
   // Making shortcut does not make sense on ChromeOS because it does not have
   // a desktop.
   dictionary->SetBoolean("disableCreateAppShortcut", true);
 #endif
 
-  PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   const ListValue* app_page_names = prefs->GetList(prefs::kNtpAppPageNames);
   if (!app_page_names || !app_page_names->GetSize()) {
     ListPrefUpdate update(prefs, prefs::kNtpAppPageNames);
     ListValue* list = update.Get();
     list->Set(0, Value::CreateStringValue(
         l10n_util::GetStringUTF16(IDS_APP_DEFAULT_PAGE_NAME)));
     dictionary->Set("appPageNames",
                     static_cast<ListValue*>(list->DeepCopy()));
   } else {
     dictionary->Set("appPageNames",
@@ skipping 508 matching lines @@
 ExtensionUninstallDialog* AppLauncherHandler::GetExtensionUninstallDialog() {
   if (!extension_uninstall_dialog_.get()) {
     Browser* browser = chrome::FindBrowserWithWebContents(
         web_ui()->GetWebContents());
     extension_uninstall_dialog_.reset(
         ExtensionUninstallDialog::Create(extension_service_->profile(),
                                          browser, this));
   }
   return extension_uninstall_dialog_.get();
 }