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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 local_state->ClearPref(prefs::kRebootAfterUpdate); | 230 local_state->ClearPref(prefs::kRebootAfterUpdate); |
231 } | 231 } |
232 } else if (parsed_command_line.HasSwitch(switches::kLoginUser) && | 232 } else if (parsed_command_line.HasSwitch(switches::kLoginUser) && |
233 parsed_command_line.HasSwitch(switches::kLoginPassword)) { | 233 parsed_command_line.HasSwitch(switches::kLoginPassword)) { |
234 BootTimesLoader::Get()->RecordLoginAttempted(); | 234 BootTimesLoader::Get()->RecordLoginAttempted(); |
235 new StubLogin( | 235 new StubLogin( |
236 parsed_command_line.GetSwitchValueASCII(switches::kLoginUser), | 236 parsed_command_line.GetSwitchValueASCII(switches::kLoginUser), |
237 parsed_command_line.GetSwitchValueASCII(switches::kLoginPassword)); | 237 parsed_command_line.GetSwitchValueASCII(switches::kLoginPassword)); |
238 } else { | 238 } else { |
239 if (!parsed_command_line.HasSwitch(::switches::kTestName)) { | 239 if (!parsed_command_line.HasSwitch(::switches::kTestName)) { |
| 240 // Enable CrasAudioHandler logging when chrome restarts after crashing. |
| 241 if (chromeos::CrasAudioHandler::IsInitialized()) |
| 242 chromeos::CrasAudioHandler::Get()->EnableLog(); |
| 243 |
240 // We did not log in (we crashed or are debugging), so we need to | 244 // We did not log in (we crashed or are debugging), so we need to |
241 // restore Sync. | 245 // restore Sync. |
242 LoginUtils::Get()->RestoreAuthenticationSession(profile); | 246 LoginUtils::Get()->RestoreAuthenticationSession(profile); |
243 } | 247 } |
244 } | 248 } |
245 } | 249 } |
246 | 250 |
247 } // namespace | 251 } // namespace |
248 | 252 |
249 namespace internal { | 253 namespace internal { |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
787 | 791 |
788 // Destroy DeviceSettingsService after g_browser_process. | 792 // Destroy DeviceSettingsService after g_browser_process. |
789 DeviceSettingsService::Shutdown(); | 793 DeviceSettingsService::Shutdown(); |
790 } | 794 } |
791 | 795 |
792 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { | 796 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { |
793 default_pinned_apps_field_trial::SetupTrial(); | 797 default_pinned_apps_field_trial::SetupTrial(); |
794 } | 798 } |
795 | 799 |
796 } // namespace chromeos | 800 } // namespace chromeos |
OLD | NEW |