Move the pepper flash to the top of the flash plugin list, if the client is within the enable-by-de…

chrome/browser/component_updater/pepper_flash_component_installer.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/component_updater/flash_component_installer.h"
 
 #include <string.h>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 160 matching lines @@
 
 // If it is a |fresh_install| we enable or disable it by default in some
 // configurations. See IsPepperFlashEnabledByDefault() for more information.
 void RegisterPepperFlashWithChrome(const FilePath& path,
                                    const Version& version,
                                    bool fresh_install) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::PepperPluginInfo plugin_info;
   if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info))
     return;
-  if (fresh_install) {
-    PluginPrefs::EnablePluginGlobally(IsPepperFlashEnabledByDefault(),
-                                      plugin_info.path);
-  }
+  bool enable_by_default = IsPepperFlashEnabledByDefault();
+  if (fresh_install)
+    PluginPrefs::EnablePluginGlobally(enable_by_default, plugin_info.path);
+
   PluginService::GetInstance()->RegisterInternalPlugin(
-      plugin_info.ToWebPluginInfo(), false);
+      plugin_info.ToWebPluginInfo(), enable_by_default);

[Bernhard Bauer, 2012/03/05 22:23:09]

Could you move this into a separate variable |add_to_front| or something so that
the meaning of the parameter is clear?

[yzshen1, 2012/03/05 22:53:37]

Done.

   PluginService::GetInstance()->RefreshPlugins();
 }
 
 // Returns true if this browser implements one of the interfaces given in
 // |interface_string|, which is a '|'-separated string of interface names.
 bool CheckPepperFlashInterfaceString(const std::string& interface_string) {
   std::vector<std::string> interface_names;
   base::SplitString(interface_string, '|', &interface_names);
   for (size_t i = 0; i < interface_names.size(); i++) {
     if (SupportsPepperInterface(interface_names[i].c_str()))
@@ skipping 158 matching lines @@
 }
 
 }  // namespace
 
 void RegisterPepperFlashComponent(ComponentUpdateService* cus) {
 #if defined(GOOGLE_CHROME_BUILD)
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&StartPepperFlashUpdateRegistration, cus));
 #endif
 }