| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/chromeos/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 local_state->ClearPref(prefs::kRebootAfterUpdate); | 229 local_state->ClearPref(prefs::kRebootAfterUpdate); |
| 230 } | 230 } |
| 231 } else if (parsed_command_line.HasSwitch(switches::kLoginUser) && | 231 } else if (parsed_command_line.HasSwitch(switches::kLoginUser) && |
| 232 parsed_command_line.HasSwitch(switches::kLoginPassword)) { | 232 parsed_command_line.HasSwitch(switches::kLoginPassword)) { |
| 233 BootTimesLoader::Get()->RecordLoginAttempted(); | 233 BootTimesLoader::Get()->RecordLoginAttempted(); |
| 234 new StubLogin( | 234 new StubLogin( |
| 235 parsed_command_line.GetSwitchValueASCII(switches::kLoginUser), | 235 parsed_command_line.GetSwitchValueASCII(switches::kLoginUser), |
| 236 parsed_command_line.GetSwitchValueASCII(switches::kLoginPassword)); | 236 parsed_command_line.GetSwitchValueASCII(switches::kLoginPassword)); |
| 237 } else { | 237 } else { |
| 238 if (!parsed_command_line.HasSwitch(::switches::kTestName)) { | 238 if (!parsed_command_line.HasSwitch(::switches::kTestName)) { |
| 239 // Enable CrasAudioHandler logging when chrome restarts after crashing. |
| 240 if (chromeos::CrasAudioHandler::IsInitialized()) |
| 241 chromeos::CrasAudioHandler::Get()->LogErrors(); |
| 242 |
| 239 // We did not log in (we crashed or are debugging), so we need to | 243 // We did not log in (we crashed or are debugging), so we need to |
| 240 // restore Sync. | 244 // restore Sync. |
| 241 LoginUtils::Get()->RestoreAuthenticationSession(profile); | 245 LoginUtils::Get()->RestoreAuthenticationSession(profile); |
| 242 } | 246 } |
| 243 } | 247 } |
| 244 } | 248 } |
| 245 | 249 |
| 246 } // namespace | 250 } // namespace |
| 247 | 251 |
| 248 namespace internal { | 252 namespace internal { |
| (...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 | 782 |
| 779 // Destroy DeviceSettingsService after g_browser_process. | 783 // Destroy DeviceSettingsService after g_browser_process. |
| 780 DeviceSettingsService::Shutdown(); | 784 DeviceSettingsService::Shutdown(); |
| 781 } | 785 } |
| 782 | 786 |
| 783 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { | 787 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { |
| 784 default_pinned_apps_field_trial::SetupTrial(); | 788 default_pinned_apps_field_trial::SetupTrial(); |
| 785 } | 789 } |
| 786 | 790 |
| 787 } // namespace chromeos | 791 } // namespace chromeos |
| OLD | NEW |