Retire the Enterprise Web Store policies.

chrome/browser/extensions/component_loader.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/extensions/component_loader.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_notifier.h"

[Joao da Silva, 2013/05/16 08:27:35]

nit: these 2 are not used

[Mattias Nissler (ping if slow), 2013/05/16 12:08:21]

Done.

 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"

[Joao da Silva, 2013/05/16 08:27:35]

nit: not used

[Mattias Nissler (ping if slow), 2013/05/16 12:08:21]

Done.

 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/common/id_util.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(USE_AURA)
 #include "grit/keyboard_resources.h"
 #endif
 
@@ skipping 45 matching lines @@
     root_directory = root_directory.Append(directory);
   }
   extension_id = GenerateId(manifest, root_directory);
 }
 
 ComponentLoader::ComponentLoader(ExtensionServiceInterface* extension_service,
                                  PrefService* profile_prefs,
                                  PrefService* local_state)
     : profile_prefs_(profile_prefs),
       local_state_(local_state),
-      extension_service_(extension_service) {
-  pref_change_registrar_.Init(profile_prefs);
-
-  // This pref is set by policy. We have to watch it for change because on
-  // ChromeOS, policy isn't loaded until after the browser process is started.
-  pref_change_registrar_.Add(
-      prefs::kEnterpriseWebStoreURL,
-      base::Bind(&ComponentLoader::AddOrReloadEnterpriseWebStore,
-                 base::Unretained(this)));
-}
+      extension_service_(extension_service) {}
 
 ComponentLoader::~ComponentLoader() {
   ClearAllRegistered();
 }
 
 void ComponentLoader::LoadAll() {
   for (RegisteredComponentExtensions::iterator it =
           component_extensions_.begin();
       it != component_extensions_.end(); ++it) {
     Load(*it);
@@ skipping 168 matching lines @@
         command_line->GetSwitchValuePath(switches::kImageLoaderExtensionPath));
     Add(IDR_IMAGE_LOADER_MANIFEST, image_loader_extension_path);
     return;
   }
 #endif  // NDEBUG
   Add(IDR_IMAGE_LOADER_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("image_loader")));
 #endif  // defined(IMAGE_LOADER_EXTENSION)
 }
 
-void ComponentLoader::AddOrReloadEnterpriseWebStore() {
-  base::FilePath path(FILE_PATH_LITERAL("enterprise_web_store"));
-
-  // Remove the extension if it was already loaded.
-  Remove(path);
-
-  std::string enterprise_webstore_url =
-      profile_prefs_->GetString(prefs::kEnterpriseWebStoreURL);
-
-  // Load the extension only if the URL preference is set.
-  if (!enterprise_webstore_url.empty()) {
-    std::string manifest_contents =
-      ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_ENTERPRISE_WEBSTORE_MANIFEST).as_string();
-
-    // The manifest is missing some values that are provided by policy.
-    DictionaryValue* manifest = ParseManifest(manifest_contents);
-    if (manifest) {
-      std::string name =
-          profile_prefs_->GetString(prefs::kEnterpriseWebStoreName);
-      manifest->SetString("app.launch.web_url", enterprise_webstore_url);
-      manifest->SetString("name", name);
-      Add(manifest, path);
-    }
-  }
-}
-
 void ComponentLoader::AddChromeApp() {
 #if defined(ENABLE_APP_LIST)
   std::string manifest_contents =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_CHROME_APP_MANIFEST).as_string();
 
   // The Value is kept for the lifetime of the ComponentLoader. This is
   // required in case LoadAll() is called again.
   DictionaryValue* manifest = ParseManifest(manifest_contents);
 
@@ skipping 46 matching lines @@
   DCHECK(!skip_session_components);
   Add(IDR_BOOKMARKS_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
   // Cloud Print component app. Not required on Chrome OS.
   Add(IDR_CLOUDPRINT_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("cloud_print")));
 #endif
 
   if (!skip_session_components) {
     Add(IDR_WEBSTORE_MANIFEST, base::FilePath(FILE_PATH_LITERAL("web_store")));
-
-    // If a URL for the enterprise webstore has been specified, load the
-    // component extension. This extension might also be loaded later, because
-    // it is specified by policy, and on ChromeOS policies are loaded after
-    // the browser process has started.
-    AddOrReloadEnterpriseWebStore();
-
     AddChromeApp();
   }
 
   AddKeyboardApp();
 
   AddDefaultComponentExtensionsWithBackgroundPages(skip_session_components);
 }
 
 void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
     bool skip_session_components) {
@@ skipping 81 matching lines @@
 
 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
   delete component->manifest;
   if (extension_service_->is_ready()) {
     extension_service_->
         UnloadExtension(component->extension_id,
                         extension_misc::UNLOAD_REASON_DISABLE);
   }
 }
 
-// static
-void ComponentLoader::RegisterUserPrefs(
-    user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterStringPref(
-      prefs::kEnterpriseWebStoreURL,
-      std::string() /* default_value */,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kEnterpriseWebStoreName,
-      std::string() /* default_value */,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-}
-
 }  // namespace extensions