| OLD | NEW | 
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/ui/ash/launcher/chrome_launcher_controller.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 
| 6 | 6 | 
| 7 #include <vector> | 7 #include <vector> | 
| 8 | 8 | 
| 9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" | 
| 10 #include "ash/desktop_background/desktop_background_controller.h" | 10 #include "ash/desktop_background/desktop_background_controller.h" | 
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 283     // the profile for that newly added user was added to the ProfileManager. | 283     // the profile for that newly added user was added to the ProfileManager. | 
| 284     registrar_.Add(this, chrome::NOTIFICATION_PROFILE_ADDED, | 284     registrar_.Add(this, chrome::NOTIFICATION_PROFILE_ADDED, | 
| 285                    content::NotificationService::AllSources()); | 285                    content::NotificationService::AllSources()); | 
| 286   } | 286   } | 
| 287   virtual ~ChromeLauncherControllerUserSwitchObserverChromeOS() { | 287   virtual ~ChromeLauncherControllerUserSwitchObserverChromeOS() { | 
| 288     user_manager::UserManager::Get()->RemoveSessionStateObserver(this); | 288     user_manager::UserManager::Get()->RemoveSessionStateObserver(this); | 
| 289   } | 289   } | 
| 290 | 290 | 
| 291   // user_manager::UserManager::UserSessionStateObserver overrides: | 291   // user_manager::UserManager::UserSessionStateObserver overrides: | 
| 292   virtual void UserAddedToSession( | 292   virtual void UserAddedToSession( | 
| 293       const user_manager::User* added_user) OVERRIDE; | 293       const user_manager::User* added_user) override; | 
| 294 | 294 | 
| 295   // content::NotificationObserver overrides: | 295   // content::NotificationObserver overrides: | 
| 296   virtual void Observe(int type, | 296   virtual void Observe(int type, | 
| 297                const content::NotificationSource& source, | 297                const content::NotificationSource& source, | 
| 298                const content::NotificationDetails& details) OVERRIDE; | 298                const content::NotificationDetails& details) override; | 
| 299 | 299 | 
| 300  private: | 300  private: | 
| 301   // Add a user to the session. | 301   // Add a user to the session. | 
| 302   void AddUser(Profile* profile); | 302   void AddUser(Profile* profile); | 
| 303 | 303 | 
| 304   // The owning ChromeLauncherController. | 304   // The owning ChromeLauncherController. | 
| 305   ChromeLauncherController* controller_; | 305   ChromeLauncherController* controller_; | 
| 306 | 306 | 
| 307   // The notification registrar to track the Profile creations after a user got | 307   // The notification registrar to track the Profile creations after a user got | 
| 308   // added to the session (if required). | 308   // added to the session (if required). | 
| (...skipping 1783 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2092 void ChromeLauncherController::ReleaseProfile() { | 2092 void ChromeLauncherController::ReleaseProfile() { | 
| 2093   if (app_sync_ui_state_) | 2093   if (app_sync_ui_state_) | 
| 2094     app_sync_ui_state_->RemoveObserver(this); | 2094     app_sync_ui_state_->RemoveObserver(this); | 
| 2095 | 2095 | 
| 2096   extensions::ExtensionRegistry::Get(profile_)->RemoveObserver(this); | 2096   extensions::ExtensionRegistry::Get(profile_)->RemoveObserver(this); | 
| 2097 | 2097 | 
| 2098   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this); | 2098   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this); | 
| 2099 | 2099 | 
| 2100   pref_change_registrar_.RemoveAll(); | 2100   pref_change_registrar_.RemoveAll(); | 
| 2101 } | 2101 } | 
| OLD | NEW | 
|---|