Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Side by Side Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 8585031: [cros, Aura] Make screen_mode static variable in StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
30 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 30 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
31 #include "chrome/browser/chromeos/input_method/input_method_util.h" 31 #include "chrome/browser/chromeos/input_method/input_method_util.h"
32 #include "chrome/browser/chromeos/login/background_view.h" 32 #include "chrome/browser/chromeos/login/background_view.h"
33 #include "chrome/browser/chromeos/login/cookie_fetcher.h" 33 #include "chrome/browser/chromeos/login/cookie_fetcher.h"
34 #include "chrome/browser/chromeos/login/language_switch_menu.h" 34 #include "chrome/browser/chromeos/login/language_switch_menu.h"
35 #include "chrome/browser/chromeos/login/login_display_host.h" 35 #include "chrome/browser/chromeos/login/login_display_host.h"
36 #include "chrome/browser/chromeos/login/ownership_service.h" 36 #include "chrome/browser/chromeos/login/ownership_service.h"
37 #include "chrome/browser/chromeos/login/parallel_authenticator.h" 37 #include "chrome/browser/chromeos/login/parallel_authenticator.h"
38 #include "chrome/browser/chromeos/login/screen_locker.h" 38 #include "chrome/browser/chromeos/login/screen_locker.h"
39 #include "chrome/browser/chromeos/login/user_manager.h" 39 #include "chrome/browser/chromeos/login/user_manager.h"
40 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
40 #include "chrome/browser/extensions/extension_service.h" 41 #include "chrome/browser/extensions/extension_service.h"
41 #include "chrome/browser/first_run/first_run.h" 42 #include "chrome/browser/first_run/first_run.h"
42 #include "chrome/browser/net/chrome_url_request_context.h" 43 #include "chrome/browser/net/chrome_url_request_context.h"
43 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" 44 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h"
44 #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h" 45 #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h"
45 #include "chrome/browser/net/gaia/token_service.h" 46 #include "chrome/browser/net/gaia/token_service.h"
46 #include "chrome/browser/net/preconnect.h" 47 #include "chrome/browser/net/preconnect.h"
47 #include "chrome/browser/policy/browser_policy_connector.h" 48 #include "chrome/browser/policy/browser_policy_connector.h"
48 #include "chrome/browser/prefs/pref_member.h" 49 #include "chrome/browser/prefs/pref_member.h"
49 #include "chrome/browser/profiles/profile.h" 50 #include "chrome/browser/profiles/profile.h"
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1309 1310
1310 void LoginUtils::Set(LoginUtils* mock) { 1311 void LoginUtils::Set(LoginUtils* mock) {
1311 LoginUtilsWrapper::GetInstance()->reset(mock); 1312 LoginUtilsWrapper::GetInstance()->reset(mock);
1312 } 1313 }
1313 1314
1314 void LoginUtils::DoBrowserLaunch(Profile* profile, 1315 void LoginUtils::DoBrowserLaunch(Profile* profile,
1315 LoginDisplayHost* login_host) { 1316 LoginDisplayHost* login_host) {
1316 if (browser_shutdown::IsTryingToQuit()) 1317 if (browser_shutdown::IsTryingToQuit())
1317 return; 1318 return;
1318 1319
1320 chromeos::StatusAreaViewChromeos::
1321 SetScreenMode(StatusAreaViewChromeos::BROWSER_MODE);
1319 BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false); 1322 BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false);
1320 1323
1321 VLOG(1) << "Launching browser..."; 1324 VLOG(1) << "Launching browser...";
1322 BrowserInit browser_init; 1325 BrowserInit browser_init;
1323 int return_code; 1326 int return_code;
1324 BrowserInit::IsFirstRun first_run = FirstRun::IsChromeFirstRun() ? 1327 BrowserInit::IsFirstRun first_run = FirstRun::IsChromeFirstRun() ?
1325 BrowserInit::IS_FIRST_RUN: BrowserInit::IS_NOT_FIRST_RUN; 1328 BrowserInit::IS_FIRST_RUN: BrowserInit::IS_NOT_FIRST_RUN;
1326 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), 1329 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(),
1327 profile, 1330 profile,
1328 FilePath(), 1331 FilePath(),
1329 BrowserInit::IS_PROCESS_STARTUP, 1332 BrowserInit::IS_PROCESS_STARTUP,
1330 first_run, 1333 first_run,
1331 &return_code); 1334 &return_code);
1332 1335
1333 // Mark login host for deletion after browser starts. This 1336 // Mark login host for deletion after browser starts. This
1334 // guarantees that the message loop will be referenced by the 1337 // guarantees that the message loop will be referenced by the
1335 // browser before it is dereferenced by the login host. 1338 // browser before it is dereferenced by the login host.
1336 if (login_host) { 1339 if (login_host) {
1337 login_host->OnSessionStart(); 1340 login_host->OnSessionStart();
1338 login_host = NULL; 1341 login_host = NULL;
1339 } 1342 }
1340 } 1343 }
1341 1344
1342 } // namespace chromeos 1345 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_html_dialog.cc ('k') | chrome/browser/chromeos/login/screen_locker_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698