Reload plugin options from user's preferences after login

Previously PluginService::InitGlobalInstance was called only from BrowserMain i.e. before user profile is mounted. This change adds options reload when user profile is available. I checked boot times are not affected by this change.

BUG=chromium-os:7556
TEST=Manual, see issue

Review URL: http://codereview.chromium.org/6299010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71938 0039d316-1c4b-4281-b951-d872f2087c98
parent c08aa1f5
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "chrome/browser/net/gaia/token_service.h" #include "chrome/browser/net/gaia/token_service.h"
#include "chrome/browser/net/preconnect.h" #include "chrome/browser/net/preconnect.h"
#include "chrome/browser/net/pref_proxy_config_service.h" #include "chrome/browser/net/pref_proxy_config_service.h"
#include "chrome/browser/plugin_updater.h"
#include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_member.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_manager.h"
...@@ -307,6 +308,10 @@ void LoginUtilsImpl::CompleteLogin( ...@@ -307,6 +308,10 @@ void LoginUtilsImpl::CompleteLogin(
SetFirstLoginPrefs(profile->GetPrefs()); SetFirstLoginPrefs(profile->GetPrefs());
} }
// Enable/disable plugins based on user preferences.
PluginUpdater::GetInstance()->DisablePluginGroupsFromPrefs(profile);
btl->AddLoginTimeMarker("PluginsStateUpdated", false);
// We suck. This is a hack since we do not have the enterprise feature // We suck. This is a hack since we do not have the enterprise feature
// done yet to pull down policies from the domain admin. We'll take this // done yet to pull down policies from the domain admin. We'll take this
// out when we get that done properly. // out when we get that done properly.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment