OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/login/login_utils.h" | 5 #include "chrome/browser/chromeos/login/login_utils.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 #include "chrome/browser/chromeos/login/background_view.h" | 30 #include "chrome/browser/chromeos/login/background_view.h" |
31 #include "chrome/browser/chromeos/login/cookie_fetcher.h" | 31 #include "chrome/browser/chromeos/login/cookie_fetcher.h" |
32 #include "chrome/browser/chromeos/login/google_authenticator.h" | 32 #include "chrome/browser/chromeos/login/google_authenticator.h" |
33 #include "chrome/browser/chromeos/login/language_switch_menu.h" | 33 #include "chrome/browser/chromeos/login/language_switch_menu.h" |
34 #include "chrome/browser/chromeos/login/login_display_host.h" | 34 #include "chrome/browser/chromeos/login/login_display_host.h" |
35 #include "chrome/browser/chromeos/login/ownership_service.h" | 35 #include "chrome/browser/chromeos/login/ownership_service.h" |
36 #include "chrome/browser/chromeos/login/parallel_authenticator.h" | 36 #include "chrome/browser/chromeos/login/parallel_authenticator.h" |
37 #include "chrome/browser/chromeos/login/screen_locker.h" | 37 #include "chrome/browser/chromeos/login/screen_locker.h" |
38 #include "chrome/browser/chromeos/login/user_manager.h" | 38 #include "chrome/browser/chromeos/login/user_manager.h" |
39 #include "chrome/browser/extensions/extension_service.h" | 39 #include "chrome/browser/extensions/extension_service.h" |
| 40 #include "chrome/browser/first_run/first_run.h" |
40 #include "chrome/browser/net/chrome_url_request_context.h" | 41 #include "chrome/browser/net/chrome_url_request_context.h" |
41 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" | 42 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" |
42 #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h" | 43 #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h" |
43 #include "chrome/browser/net/gaia/token_service.h" | 44 #include "chrome/browser/net/gaia/token_service.h" |
44 #include "chrome/browser/net/preconnect.h" | 45 #include "chrome/browser/net/preconnect.h" |
45 #include "chrome/browser/policy/browser_policy_connector.h" | 46 #include "chrome/browser/policy/browser_policy_connector.h" |
46 #include "chrome/browser/prefs/pref_member.h" | 47 #include "chrome/browser/prefs/pref_member.h" |
47 #include "chrome/browser/profiles/profile.h" | 48 #include "chrome/browser/profiles/profile.h" |
48 #include "chrome/browser/profiles/profile_manager.h" | 49 #include "chrome/browser/profiles/profile_manager.h" |
49 #include "chrome/browser/sync/profile_sync_service.h" | 50 #include "chrome/browser/sync/profile_sync_service.h" |
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1130 void LoginUtils::DoBrowserLaunch(Profile* profile, | 1131 void LoginUtils::DoBrowserLaunch(Profile* profile, |
1131 LoginDisplayHost* login_host) { | 1132 LoginDisplayHost* login_host) { |
1132 if (browser_shutdown::IsTryingToQuit()) | 1133 if (browser_shutdown::IsTryingToQuit()) |
1133 return; | 1134 return; |
1134 | 1135 |
1135 BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false); | 1136 BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false); |
1136 | 1137 |
1137 VLOG(1) << "Launching browser..."; | 1138 VLOG(1) << "Launching browser..."; |
1138 BrowserInit browser_init; | 1139 BrowserInit browser_init; |
1139 int return_code; | 1140 int return_code; |
| 1141 BrowserInit::IsFirstRun first_run = FirstRun::IsChromeFirstRun() ? |
| 1142 BrowserInit::IS_FIRST_RUN: BrowserInit::IS_NOT_FIRST_RUN; |
1140 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), | 1143 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), |
1141 profile, | 1144 profile, |
1142 FilePath(), | 1145 FilePath(), |
1143 true, | 1146 BrowserInit::IS_PROCESS_STARTUP, |
| 1147 first_run, |
1144 &return_code); | 1148 &return_code); |
1145 | 1149 |
1146 // Mark login host for deletion after browser starts. This | 1150 // Mark login host for deletion after browser starts. This |
1147 // guarantees that the message loop will be referenced by the | 1151 // guarantees that the message loop will be referenced by the |
1148 // browser before it is dereferenced by the login host. | 1152 // browser before it is dereferenced by the login host. |
1149 if (login_host) { | 1153 if (login_host) { |
1150 login_host->OnSessionStart(); | 1154 login_host->OnSessionStart(); |
1151 login_host = NULL; | 1155 login_host = NULL; |
1152 } | 1156 } |
1153 } | 1157 } |
1154 | 1158 |
1155 } // namespace chromeos | 1159 } // namespace chromeos |
OLD | NEW |