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

Side by Side Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 6299010: Reload plugin options from user's preferences after login (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments resolved Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/login_utils.h" 5 #include "chrome/browser/chromeos/login/login_utils.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/chromeos/login/ownership_service.h" 30 #include "chrome/browser/chromeos/login/ownership_service.h"
31 #include "chrome/browser/chromeos/login/parallel_authenticator.h" 31 #include "chrome/browser/chromeos/login/parallel_authenticator.h"
32 #include "chrome/browser/chromeos/login/user_image_downloader.h" 32 #include "chrome/browser/chromeos/login/user_image_downloader.h"
33 #include "chrome/browser/chromeos/login/user_manager.h" 33 #include "chrome/browser/chromeos/login/user_manager.h"
34 #include "chrome/browser/chromeos/proxy_config_service.h" 34 #include "chrome/browser/chromeos/proxy_config_service.h"
35 #include "chrome/browser/extensions/extension_service.h" 35 #include "chrome/browser/extensions/extension_service.h"
36 #include "chrome/browser/net/chrome_url_request_context.h" 36 #include "chrome/browser/net/chrome_url_request_context.h"
37 #include "chrome/browser/net/gaia/token_service.h" 37 #include "chrome/browser/net/gaia/token_service.h"
38 #include "chrome/browser/net/preconnect.h" 38 #include "chrome/browser/net/preconnect.h"
39 #include "chrome/browser/net/pref_proxy_config_service.h" 39 #include "chrome/browser/net/pref_proxy_config_service.h"
40 #include "chrome/browser/plugin_updater.h"
40 #include "chrome/browser/prefs/pref_member.h" 41 #include "chrome/browser/prefs/pref_member.h"
41 #include "chrome/browser/profiles/profile.h" 42 #include "chrome/browser/profiles/profile.h"
42 #include "chrome/browser/profiles/profile_manager.h" 43 #include "chrome/browser/profiles/profile_manager.h"
43 #include "chrome/browser/sync/profile_sync_service.h" 44 #include "chrome/browser/sync/profile_sync_service.h"
44 #include "chrome/browser/ui/browser_init.h" 45 #include "chrome/browser/ui/browser_init.h"
45 #include "chrome/common/chrome_paths.h" 46 #include "chrome/common/chrome_paths.h"
46 #include "chrome/common/chrome_switches.h" 47 #include "chrome/common/chrome_switches.h"
47 #include "chrome/common/logging_chrome.h" 48 #include "chrome/common/logging_chrome.h"
48 #include "chrome/common/net/gaia/gaia_auth_fetcher.h" 49 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
49 #include "chrome/common/net/gaia/gaia_constants.h" 50 #include "chrome/common/net/gaia/gaia_constants.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 } 301 }
301 } 302 }
302 btl->AddLoginTimeMarker("TPMOwned", false); 303 btl->AddLoginTimeMarker("TPMOwned", false);
303 304
304 RespectLocalePreference(profile->GetPrefs()); 305 RespectLocalePreference(profile->GetPrefs());
305 306
306 if (first_login) { 307 if (first_login) {
307 SetFirstLoginPrefs(profile->GetPrefs()); 308 SetFirstLoginPrefs(profile->GetPrefs());
308 } 309 }
309 310
311 // Enable/disable plugins based on user preferences.
312 PluginUpdater::GetInstance()->DisablePluginGroupsFromPrefs(profile);
313 btl->AddLoginTimeMarker("PluginsStateUpdated", false);
314
310 // We suck. This is a hack since we do not have the enterprise feature 315 // We suck. This is a hack since we do not have the enterprise feature
311 // done yet to pull down policies from the domain admin. We'll take this 316 // done yet to pull down policies from the domain admin. We'll take this
312 // out when we get that done properly. 317 // out when we get that done properly.
313 // TODO(xiyuan): Remove this once enterprise feature is ready. 318 // TODO(xiyuan): Remove this once enterprise feature is ready.
314 if (EndsWith(username, "@google.com", true)) { 319 if (EndsWith(username, "@google.com", true)) {
315 PrefService* pref_service = profile->GetPrefs(); 320 PrefService* pref_service = profile->GetPrefs();
316 pref_service->SetBoolean(prefs::kEnableScreenLock, true); 321 pref_service->SetBoolean(prefs::kEnableScreenLock, true);
317 } 322 }
318 323
319 DoBrowserLaunch(profile); 324 DoBrowserLaunch(profile);
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 BrowserInit browser_init; 579 BrowserInit browser_init;
575 int return_code; 580 int return_code;
576 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), 581 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(),
577 profile, 582 profile,
578 FilePath(), 583 FilePath(),
579 true, 584 true,
580 &return_code); 585 &return_code);
581 } 586 }
582 587
583 } // namespace chromeos 588 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698