Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5643)

Unified Diff: chrome/browser/component_updater/pepper_flash_component_installer.cc

Issue 10872034: Changing PluginPrefs to use PluginFinder's async interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@test_async
Patch Set: Fixed bug in chromeos loading the plugins page Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/gview_request_interceptor_unittest.cc ('k') | chrome/browser/plugin_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/component_updater/pepper_flash_component_installer.cc
diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
index a5f6545b628e32dd640eccd5a830e0992dccdcf0..ab38ea8fc316147b066119af60c992f6b99edd87 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -165,6 +165,10 @@ bool MakePepperFlashPluginInfo(const FilePath& flash_path,
return true;
}
+void CanEnablePluginCallbackDoNothing(bool dummy) {
+ // Ignore the state-change check result.
+}
+
// 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,
@@ -176,8 +180,10 @@ void RegisterPepperFlashWithChrome(const FilePath& path,
return;
bool enable_by_default = IsPepperFlashEnabledByDefault();
if (fresh_install)
- PluginPrefs::EnablePluginGlobally(enable_by_default, plugin_info.path,
- base::Bind(&base::DoNothing));
+ PluginPrefs::EnablePluginGlobally(
+ enable_by_default,
+ plugin_info.path,
+ base::Bind(&CanEnablePluginCallbackDoNothing));
bool add_to_front = enable_by_default;
PluginService::GetInstance()->RegisterInternalPlugin(
« no previous file with comments | « chrome/browser/chromeos/gview_request_interceptor_unittest.cc ('k') | chrome/browser/plugin_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698