Index: chrome/browser/chromeos/first_run/first_run.cc |
diff --git a/chrome/browser/chromeos/first_run/first_run.cc b/chrome/browser/chromeos/first_run/first_run.cc |
index 7ac58d76fab82fec582aae35e8bd34ecf8074a95..3e79dc66885bcc9689eead646d7b875437c3bc2e 100644 |
--- a/chrome/browser/chromeos/first_run/first_run.cc |
+++ b/chrome/browser/chromeos/first_run/first_run.cc |
@@ -7,7 +7,6 @@ |
#include "base/prefs/pref_service.h" |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/chromeos/first_run/first_run_controller.h" |
-#include "chrome/browser/chromeos/login/users/user_manager.h" |
#include "chrome/browser/chromeos/profiles/profile_helper.h" |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/ui/extensions/application_launch.h" |
@@ -15,6 +14,7 @@ |
#include "chrome/common/pref_names.h" |
#include "chromeos/chromeos_switches.h" |
#include "components/pref_registry/pref_registry_syncable.h" |
+#include "components/user_manager/user_manager.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
#include "content/public/browser/notification_service.h" |
@@ -67,7 +67,7 @@ class DialogLauncher : public content::NotificationObserver { |
bool launched_in_test = command_line->HasSwitch(::switches::kTestType); |
bool launched_in_telemetry = |
command_line->HasSwitch(switches::kOobeSkipPostLogin); |
- bool is_user_new = chromeos::UserManager::Get()->IsCurrentUserNew(); |
+ bool is_user_new = user_manager::UserManager::Get()->IsCurrentUserNew(); |
bool first_run_forced = command_line->HasSwitch(switches::kForceFirstRunUI); |
bool first_run_seen = |
profile_->GetPrefs()->GetBoolean(prefs::kFirstRunTutorialShown); |
@@ -96,9 +96,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
} |
void MaybeLaunchDialogAfterSessionStart() { |
- UserManager* user_manager = UserManager::Get(); |
- new DialogLauncher( |
- ProfileHelper::Get()->GetProfileByUser(user_manager->GetActiveUser())); |
+ new DialogLauncher(ProfileHelper::Get()->GetProfileByUser( |
Dmitry Polukhin
2014/08/12 09:03:12
I think it is better to replace with ProfileManag
Nikita (slow)
2014/08/12 09:34:42
Done.
|
+ user_manager::UserManager::Get()->GetActiveUser())); |
} |
void LaunchTutorial() { |