app_list ExtensionAppModelBuilder: Observe and handle changes to prefs::kHideWebStoreIcon.

The pref was already implicitly checked on initialization during PopulateApps (via extensions::ui_util::ShouldDisplayInAppLauncher).
This CL adds handling of pref changes by re-checking ShouldDisplayInAppLauncher. It also extends an existing test to cover these cases.

Handling of prefs::kHideWebStoreIcon was originally added in https://codereview.chromium.org/12038067

BUG=

Review URL: https://codereview.chromium.org/409123002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285886 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/app_list/extension_app_model_builder.cc

@@ -19,6 +19,7 @@
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/browser/ui/app_list/extension_app_item.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/pref_names.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
@@ -56,7 +57,7 @@ void ExtensionAppModelBuilder::InitializeWithService(
   model_ = service->model();
   service_ = service;
   profile_ = service->profile();
-  InitializePrefChangeRegistrar();
+  InitializePrefChangeRegistrars();
 
   BuildModel();
 }
@@ -68,12 +69,18 @@ void ExtensionAppModelBuilder::InitializeWithProfile(
   model_ = model;
   model_->top_level_item_list()->AddObserver(this);
   profile_ = profile;
-  InitializePrefChangeRegistrar();
+  InitializePrefChangeRegistrars();
 
   BuildModel();
 }
 
-void ExtensionAppModelBuilder::InitializePrefChangeRegistrar() {
+void ExtensionAppModelBuilder::InitializePrefChangeRegistrars() {
+  profile_pref_change_registrar_.Init(profile_->GetPrefs());
+  profile_pref_change_registrar_.Add(
+      prefs::kHideWebStoreIcon,
+      base::Bind(&ExtensionAppModelBuilder::OnProfilePreferenceChanged,
+                 base::Unretained(this)));
+
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableStreamlinedHostedApps))
     return;
@@ -90,6 +97,33 @@ void ExtensionAppModelBuilder::InitializePrefChangeRegistrar() {
                base::Unretained(this)));
 }
 
+void ExtensionAppModelBuilder::OnProfilePreferenceChanged() {
+  extensions::ExtensionSet extensions;
+  controller_->GetApps(profile_, &extensions);
+
+  for (extensions::ExtensionSet::const_iterator app = extensions.begin();
+       app != extensions.end(); ++app) {
+    bool should_display =
+        extensions::ui_util::ShouldDisplayInAppLauncher(*app, profile_);
+    bool does_display = GetExtensionAppItem((*app)->id()) != NULL;
+
+    if (should_display == does_display)
+      continue;
+
+    if (should_display) {
+      InsertApp(CreateAppItem((*app)->id(),
+                              "",
+                              gfx::ImageSkia(),
+                              (*app)->is_platform_app()));
+    } else {
+      if (service_)
+        service_->RemoveItem((*app)->id());
+      else
+        model_->DeleteItem((*app)->id());
+    }
+  }
+}
+
 void ExtensionAppModelBuilder::OnExtensionPreferenceChanged() {
   model_->NotifyExtensionPreferenceChanged();
 }

chrome/browser/ui/app_list/extension_app_model_builder.h

@@ -97,9 +97,6 @@ class ExtensionAppModelBuilder : public extensions::InstallObserver,
   // Populates the model with apps.
   void PopulateApps();
 
-  // Re-sort apps in case app ordinal prefs are changed.
-  void ResortApps();
-
   // Inserts an app based on app ordinal prefs.
   void InsertApp(scoped_ptr<ExtensionAppItem> app);
 
@@ -116,10 +113,14 @@ class ExtensionAppModelBuilder : public extensions::InstallObserver,
   // Returns app instance matching |extension_id| or NULL.
   ExtensionAppItem* GetExtensionAppItem(const std::string& extension_id);
 
-  // Initializes the |extension_pref_change_registrar| to listen for extension
-  // prefs changes. OnExtensionPreferenceChanged() is called when extension
-  // prefs change.
-  void InitializePrefChangeRegistrar();
+  // Initializes the |profile_pref_change_registrar_| and the
+  // |extension_pref_change_registrar_| to listen for changes to profile and
+  // extension prefs, and call OnProfilePreferenceChanged() or
+  // OnExtensionPreferenceChanged().
+  void InitializePrefChangeRegistrars();
+
+  // Handles profile prefs changes.
+  void OnProfilePreferenceChanged();
 
   // Handles extension prefs changes.
   void OnExtensionPreferenceChanged();
@@ -128,6 +129,9 @@ class ExtensionAppModelBuilder : public extensions::InstallObserver,
   app_list::AppListSyncableService* service_;
   Profile* profile_;
 
+  // Registrar used to monitor the profile prefs.
+  PrefChangeRegistrar profile_pref_change_registrar_;
+
   // Registrar used to monitor the extension prefs.
   PrefChangeRegistrar extension_pref_change_registrar_;
 

chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc

@@ -171,20 +171,29 @@ TEST_F(ExtensionAppModelBuilderTest, HideWebStore) {
   app_list::AppListModel model1;
   ExtensionAppModelBuilder builder1(controller_.get());
   builder1.InitializeWithProfile(profile_.get(), &model1);
-  std::string content = GetModelContent(&model1);
-  EXPECT_NE(std::string::npos, content.find("webstore"));
-  EXPECT_NE(std::string::npos, content.find("enterprise_webstore"));
+  EXPECT_TRUE(model1.FindItem(store->id()));
+  EXPECT_TRUE(model1.FindItem(enterprise_store->id()));
 
   // Activate the HideWebStoreIcon policy.
   profile_->GetPrefs()->SetBoolean(prefs::kHideWebStoreIcon, true);
 
-  // Web stores should NOT be in the AppListModel.
+  // Now the web stores should not be present anymore.
+  EXPECT_FALSE(model1.FindItem(store->id()));
+  EXPECT_FALSE(model1.FindItem(enterprise_store->id()));
+
+  // Build a new AppListModel; web stores should NOT be present.
   app_list::AppListModel model2;
   ExtensionAppModelBuilder builder2(controller_.get());
   builder2.InitializeWithProfile(profile_.get(), &model2);
-  content = GetModelContent(&model2);
-  EXPECT_EQ(std::string::npos, content.find("webstore"));
-  EXPECT_EQ(std::string::npos, content.find("enterprise_webstore"));
+  EXPECT_FALSE(model2.FindItem(store->id()));
+  EXPECT_FALSE(model2.FindItem(enterprise_store->id()));
+
+  // Deactivate the HideWebStoreIcon policy again.
+  profile_->GetPrefs()->SetBoolean(prefs::kHideWebStoreIcon, false);
+
+  // Now the web stores should have appeared.
+  EXPECT_TRUE(model2.FindItem(store->id()));
+  EXPECT_TRUE(model2.FindItem(enterprise_store->id()));
 }
 
 TEST_F(ExtensionAppModelBuilderTest, DisableAndEnable) {