OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/profiles/profile_manager.h" | 5 #include "chrome/browser/profiles/profile_manager.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
795 | 795 |
796 void ProfileManager::Observe( | 796 void ProfileManager::Observe( |
797 int type, | 797 int type, |
798 const content::NotificationSource& source, | 798 const content::NotificationSource& source, |
799 const content::NotificationDetails& details) { | 799 const content::NotificationDetails& details) { |
800 #if defined(OS_CHROMEOS) | 800 #if defined(OS_CHROMEOS) |
801 if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) { | 801 if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) { |
802 logged_in_ = true; | 802 logged_in_ = true; |
803 | 803 |
804 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 804 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
805 LOG(ERROR) << ">>>>>>>> " << command_line.GetCommandLineString(); | |
dzhioev (left Google)
2014/05/21 19:13:01
Did you commit this line by mistake?
Nikita (slow)
2014/05/26 08:06:38
Thanks, removed in https://codereview.chromium.org
| |
805 if (!command_line.HasSwitch(switches::kTestType)) { | 806 if (!command_line.HasSwitch(switches::kTestType)) { |
806 // If we don't have a mounted profile directory we're in trouble. | 807 // If we don't have a mounted profile directory we're in trouble. |
807 // TODO(davemoore) Once we have better api this check should ensure that | 808 // TODO(davemoore) Once we have better api this check should ensure that |
808 // our profile directory is the one that's mounted, and that it's mounted | 809 // our profile directory is the one that's mounted, and that it's mounted |
809 // as the current user. | 810 // as the current user. |
810 chromeos::DBusThreadManager::Get()->GetCryptohomeClient()->IsMounted( | 811 chromeos::DBusThreadManager::Get()->GetCryptohomeClient()->IsMounted( |
811 base::Bind(&CheckCryptohomeIsMounted)); | 812 base::Bind(&CheckCryptohomeIsMounted)); |
812 | 813 |
813 // Confirm that we hadn't loaded the new profile previously. | 814 // Confirm that we hadn't loaded the new profile previously. |
814 base::FilePath default_profile_dir = user_data_dir_.Append( | 815 base::FilePath default_profile_dir = user_data_dir_.Append( |
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1280 last_non_managed_profile_path.BaseName().MaybeAsASCII()); | 1281 last_non_managed_profile_path.BaseName().MaybeAsASCII()); |
1281 FinishDeletingProfile(profile_to_delete_path); | 1282 FinishDeletingProfile(profile_to_delete_path); |
1282 } | 1283 } |
1283 } | 1284 } |
1284 } | 1285 } |
1285 #endif | 1286 #endif |
1286 | 1287 |
1287 ProfileManagerWithoutInit::ProfileManagerWithoutInit( | 1288 ProfileManagerWithoutInit::ProfileManagerWithoutInit( |
1288 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { | 1289 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { |
1289 } | 1290 } |
OLD | NEW |