summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-21 17:46:36 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-21 17:46:36 +0000
commitdd5e392a53c7aa927a9e6cd4ad6a46241b25cbaa (patch)
treeac02ba00655f523156fd95adc98e6661bab31a91 /chrome/browser/chromeos/chrome_browser_main_chromeos.cc
parente0bc89ec46f87d8da3d6547f6198bf98546ce6ed (diff)
downloadchromium_src-dd5e392a53c7aa927a9e6cd4ad6a46241b25cbaa.zip
chromium_src-dd5e392a53c7aa927a9e6cd4ad6a46241b25cbaa.tar.gz
chromium_src-dd5e392a53c7aa927a9e6cd4ad6a46241b25cbaa.tar.bz2
Make invalidations work for Chrome OS Kiosk Apps.
Kiosk Apps don't have a user logged in, so SigninManager and ProfileOAuth2TokenService don't work. However, Kiosk Apps have access to a device-level robot account for identity. Wire this up with the invalidation code by breaking out the authentication-related pieces into a separate interface and providing implementations both for the regular Profile case as well as Kiosk Apps. The appropriate implementation gets selected by InvalidationServiceFactory. BUG=chromium:269455 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258522 Review URL: https://codereview.chromium.org/179843002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258623 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/chrome_browser_main_chromeos.cc')
-rw-r--r--chrome/browser/chromeos/chrome_browser_main_chromeos.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 46d57b6..201758d 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -756,9 +756,6 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// Destroy the application name notifier for Kiosk mode.
KioskModeIdleAppNameNotification::Shutdown();
- // Stops all in-flight OAuth2 token fetchers before the IO thread stops.
- DeviceOAuth2TokenServiceFactory::Shutdown();
-
// Shutdown the upgrade detector for Chrome OS. The upgrade detector
// stops monitoring changes from the update engine.
if (UpgradeDetectorChromeos::GetInstance())
@@ -835,6 +832,9 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// Ash needs to be closed before UserManager is destroyed.
ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
+ // Stops all in-flight OAuth2 token fetchers before the IO thread stops.
+ DeviceOAuth2TokenServiceFactory::Shutdown();
+
// Called after
// ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to be
// executed after execution of chrome::CloseAsh(), because some