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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
526 if (parsed_command_line().HasSwitch(switches::kGuestSession)) { | 526 if (parsed_command_line().HasSwitch(switches::kGuestSession)) { |
527 // Disable sync and extensions if we're in "browse without sign-in" mode. | 527 // Disable sync and extensions if we're in "browse without sign-in" mode. |
528 singleton_command_line->AppendSwitch(::switches::kDisableSync); | 528 singleton_command_line->AppendSwitch(::switches::kDisableSync); |
529 singleton_command_line->AppendSwitch(::switches::kDisableExtensions); | 529 singleton_command_line->AppendSwitch(::switches::kDisableExtensions); |
530 browser_defaults::bookmarks_enabled = false; | 530 browser_defaults::bookmarks_enabled = false; |
531 } | 531 } |
532 | 532 |
533 // If we're not running on real Chrome OS hardware (or under VM), and are not | 533 // If we're not running on real Chrome OS hardware (or under VM), and are not |
534 // showing the login manager or attempting a command line login, login with a | 534 // showing the login manager or attempting a command line login, login with a |
535 // stub user. | 535 // stub user. |
536 if (!base::SysInfo::IsRunningOnChromeOS() && | 536 if (/*!base::SysInfo::IsRunningOnChromeOS() &&*/ |
537 !parsed_command_line().HasSwitch(switches::kLoginManager) && | 537 !parsed_command_line().HasSwitch(switches::kLoginManager) && |
538 !parsed_command_line().HasSwitch(switches::kLoginUser) && | 538 !parsed_command_line().HasSwitch(switches::kLoginUser) && |
539 !parsed_command_line().HasSwitch(switches::kGuestSession)) { | 539 !parsed_command_line().HasSwitch(switches::kGuestSession)) { |
540 singleton_command_line->AppendSwitchASCII( | 540 singleton_command_line->AppendSwitchASCII( |
541 switches::kLoginUser, | 541 switches::kLoginUser, |
542 cryptohome::Identification(user_manager::StubAccountId()).id()); | 542 cryptohome::Identification(user_manager::StubAccountId()).id()); |
543 if (!parsed_command_line().HasSwitch(switches::kLoginProfile)) { | 543 if (!parsed_command_line().HasSwitch(switches::kLoginProfile)) { |
544 singleton_command_line->AppendSwitchASCII(switches::kLoginProfile, | 544 singleton_command_line->AppendSwitchASCII(switches::kLoginProfile, |
545 chrome::kTestUserProfileDir); | 545 chrome::kTestUserProfileDir); |
546 } | 546 } |
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1142 // outlive CertLoader. | 1142 // outlive CertLoader. |
1143 system_token_certdb_initializer_.reset(); | 1143 system_token_certdb_initializer_.reset(); |
1144 | 1144 |
1145 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 1145 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
1146 | 1146 |
1147 // Destroy DeviceSettingsService after g_browser_process. | 1147 // Destroy DeviceSettingsService after g_browser_process. |
1148 DeviceSettingsService::Shutdown(); | 1148 DeviceSettingsService::Shutdown(); |
1149 } | 1149 } |
1150 | 1150 |
1151 } // namespace chromeos | 1151 } // namespace chromeos |
OLD | NEW |