Enable script bubble by default on all but mac.

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_notifier.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_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/extensions/feature_switch.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OFFICIAL_BUILD)
 #include "chrome/browser/defaults.h"
 #endif
 
@@ skipping 48 matching lines @@
   pref_change_registrar_.Add(
       prefs::kEnterpriseWebStoreURL,
       base::Bind(&ComponentLoader::AddOrReloadEnterpriseWebStore,
                  base::Unretained(this)));
 }
 
 ComponentLoader::~ComponentLoader() {
   ClearAllRegistered();
 }
 
-const Extension* ComponentLoader::GetScriptBubble() const {
-  if (script_bubble_id_.empty())
-    return NULL;
-
-  return extension_service_->extensions()->GetByID(script_bubble_id_);
-}
-
 void ComponentLoader::LoadAll() {
   for (RegisteredComponentExtensions::iterator it =
           component_extensions_.begin();
       it != component_extensions_.end(); ++it) {
     Load(*it);
   }
 }
 
 DictionaryValue* ComponentLoader::ParseManifest(
     const std::string& manifest_contents) const {
@@ skipping 197 matching lines @@
 
   // Update manifest to use a proper name.
   manifest->SetString(extension_manifest_keys::kName,
                       l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME));
 
   if (manifest)
     Add(manifest, FilePath(FILE_PATH_LITERAL("chrome_app")));
 #endif
 }
 
-void ComponentLoader::AddScriptBubble() {
-  if (FeatureSwitch::script_bubble()->IsEnabled()) {
-    script_bubble_id_ =
-        Add(IDR_SCRIPT_BUBBLE_MANIFEST,
-            FilePath(FILE_PATH_LITERAL("script_bubble")));
-  }
-}
-
 // static
 void ComponentLoader::EnableBackgroundExtensionsForTesting() {
   enable_background_extensions_during_testing = true;
 }
 
 void ComponentLoader::AddDefaultComponentExtensions() {
   // Do not add component extensions that have background pages here -- add them
   // to AddDefaultComponentExtensionsWithBackgroundPages.
 
 #if defined(OS_CHROMEOS)
@@ skipping 41 matching lines @@
   // 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();
 
 #if defined(USE_ASH)
   AddChromeApp();
 #endif
 
-  AddScriptBubble();
   AddDefaultComponentExtensionsWithBackgroundPages();
 }
 
 void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   // Component extensions with background pages are not enabled during tests
   // because they generate a lot of background behavior that can interfere.
   if (!enable_background_extensions_during_testing &&
       command_line->HasSwitch(switches::kTestType)) {
@@ skipping 34 matching lines @@
 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
                             std::string() /* default_value */,
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName,
                             std::string() /* default_value */,
                             PrefService::UNSYNCABLE_PREF);
 }
 
 }  // namespace extensions