OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/session/user_session_manager.h" | 5 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 1464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1475 login_host->BeforeSessionStart(); | 1475 login_host->BeforeSessionStart(); |
1476 } | 1476 } |
1477 | 1477 |
1478 BootTimesRecorder::Get()->AddLoginTimeMarker("BrowserLaunched", false); | 1478 BootTimesRecorder::Get()->AddLoginTimeMarker("BrowserLaunched", false); |
1479 | 1479 |
1480 VLOG(1) << "Launching browser..."; | 1480 VLOG(1) << "Launching browser..."; |
1481 TRACE_EVENT0("login", "LaunchBrowser"); | 1481 TRACE_EVENT0("login", "LaunchBrowser"); |
1482 | 1482 |
1483 if (should_launch_browser_) { | 1483 if (should_launch_browser_) { |
1484 StartupBrowserCreator browser_creator; | 1484 StartupBrowserCreator browser_creator; |
1485 int return_code; | |
1486 chrome::startup::IsFirstRun first_run = | 1485 chrome::startup::IsFirstRun first_run = |
1487 ::first_run::IsChromeFirstRun() ? chrome::startup::IS_FIRST_RUN | 1486 ::first_run::IsChromeFirstRun() ? chrome::startup::IS_FIRST_RUN |
1488 : chrome::startup::IS_NOT_FIRST_RUN; | 1487 : chrome::startup::IS_NOT_FIRST_RUN; |
1489 | 1488 |
1490 browser_creator.LaunchBrowser( | 1489 browser_creator.LaunchBrowser( |
1491 *base::CommandLine::ForCurrentProcess(), profile, base::FilePath(), | 1490 *base::CommandLine::ForCurrentProcess(), profile, base::FilePath(), |
1492 chrome::startup::IS_PROCESS_STARTUP, first_run, &return_code); | 1491 chrome::startup::IS_PROCESS_STARTUP, first_run); |
1493 | 1492 |
1494 // Triggers app launcher start page service to load start page web contents. | 1493 // Triggers app launcher start page service to load start page web contents. |
1495 app_list::StartPageService::Get(profile); | 1494 app_list::StartPageService::Get(profile); |
1496 } else { | 1495 } else { |
1497 LOG(WARNING) << "Browser hasn't been launched, should_launch_browser_" | 1496 LOG(WARNING) << "Browser hasn't been launched, should_launch_browser_" |
1498 << " is false. This is normal in some tests."; | 1497 << " is false. This is normal in some tests."; |
1499 } | 1498 } |
1500 | 1499 |
1501 // Mark login host for deletion after browser starts. This | 1500 // Mark login host for deletion after browser starts. This |
1502 // guarantees that the message loop will be referenced by the | 1501 // guarantees that the message loop will be referenced by the |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1537 default_ime_states_.erase(profile); | 1536 default_ime_states_.erase(profile); |
1538 } | 1537 } |
1539 | 1538 |
1540 void UserSessionManager::InjectStubUserContext( | 1539 void UserSessionManager::InjectStubUserContext( |
1541 const UserContext& user_context) { | 1540 const UserContext& user_context) { |
1542 injected_user_context_.reset(new UserContext(user_context)); | 1541 injected_user_context_.reset(new UserContext(user_context)); |
1543 authenticator_ = NULL; | 1542 authenticator_ = NULL; |
1544 } | 1543 } |
1545 | 1544 |
1546 } // namespace chromeos | 1545 } // namespace chromeos |
OLD | NEW |