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

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

Issue 651843003: [cros-login-refactor] Move CompleteOffTheRecordLogin to UserSessionManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 6 years, 2 months 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 19 matching lines...) Expand all
30 #include "base/task_runner_util.h" 30 #include "base/task_runner_util.h"
31 #include "base/threading/worker_pool.h" 31 #include "base/threading/worker_pool.h"
32 #include "base/time/time.h" 32 #include "base/time/time.h"
33 #include "chrome/browser/about_flags.h" 33 #include "chrome/browser/about_flags.h"
34 #include "chrome/browser/app_mode/app_mode_utils.h" 34 #include "chrome/browser/app_mode/app_mode_utils.h"
35 #include "chrome/browser/browser_process.h" 35 #include "chrome/browser/browser_process.h"
36 #include "chrome/browser/browser_shutdown.h" 36 #include "chrome/browser/browser_shutdown.h"
37 #include "chrome/browser/chrome_notification_types.h" 37 #include "chrome/browser/chrome_notification_types.h"
38 #include "chrome/browser/chromeos/boot_times_loader.h" 38 #include "chrome/browser/chromeos/boot_times_loader.h"
39 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h" 39 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"
40 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
41 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" 40 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
42 #include "chrome/browser/chromeos/login/existing_user_controller.h" 41 #include "chrome/browser/chromeos/login/existing_user_controller.h"
43 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 42 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
44 #include "chrome/browser/chromeos/login/profile_auth_data.h" 43 #include "chrome/browser/chromeos/login/profile_auth_data.h"
45 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" 44 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
46 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory .h" 45 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory .h"
47 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 46 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
48 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" 47 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
49 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" 48 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
50 #include "chrome/browser/chromeos/login/startup_utils.h"
51 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h" 49 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
52 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 50 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
53 #include "chrome/browser/chromeos/login/user_flow.h" 51 #include "chrome/browser/chromeos/login/user_flow.h"
54 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 52 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
55 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" 53 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
56 #include "chrome/browser/chromeos/profiles/profile_helper.h" 54 #include "chrome/browser/chromeos/profiles/profile_helper.h"
57 #include "chrome/browser/chromeos/settings/cros_settings.h" 55 #include "chrome/browser/chromeos/settings/cros_settings.h"
58 #include "chrome/browser/extensions/extension_service.h" 56 #include "chrome/browser/extensions/extension_service.h"
59 #include "chrome/browser/first_run/first_run.h" 57 #include "chrome/browser/first_run/first_run.h"
60 #include "chrome/browser/google/google_brand_chromeos.h" 58 #include "chrome/browser/google/google_brand_chromeos.h"
(...skipping 10 matching lines...) Expand all
71 #include "chrome/common/chrome_switches.h" 69 #include "chrome/common/chrome_switches.h"
72 #include "chrome/common/logging_chrome.h" 70 #include "chrome/common/logging_chrome.h"
73 #include "chrome/common/pref_names.h" 71 #include "chrome/common/pref_names.h"
74 #include "chromeos/chromeos_switches.h" 72 #include "chromeos/chromeos_switches.h"
75 #include "chromeos/cryptohome/cryptohome_util.h" 73 #include "chromeos/cryptohome/cryptohome_util.h"
76 #include "chromeos/dbus/cryptohome_client.h" 74 #include "chromeos/dbus/cryptohome_client.h"
77 #include "chromeos/dbus/dbus_method_call_status.h" 75 #include "chromeos/dbus/dbus_method_call_status.h"
78 #include "chromeos/dbus/dbus_thread_manager.h" 76 #include "chromeos/dbus/dbus_thread_manager.h"
79 #include "chromeos/dbus/session_manager_client.h" 77 #include "chromeos/dbus/session_manager_client.h"
80 #include "chromeos/login/auth/user_context.h" 78 #include "chromeos/login/auth/user_context.h"
81 #include "chromeos/login/user_names.h"
82 #include "chromeos/settings/cros_settings_names.h" 79 #include "chromeos/settings/cros_settings_names.h"
83 #include "components/signin/core/browser/signin_manager.h" 80 #include "components/signin/core/browser/signin_manager.h"
84 #include "components/user_manager/user.h" 81 #include "components/user_manager/user.h"
85 #include "components/user_manager/user_manager.h" 82 #include "components/user_manager/user_manager.h"
86 #include "content/public/browser/browser_thread.h" 83 #include "content/public/browser/browser_thread.h"
87 #include "content/public/browser/notification_service.h" 84 #include "content/public/browser/notification_service.h"
88 #include "google_apis/gaia/gaia_auth_consumer.h" 85 #include "google_apis/gaia/gaia_auth_consumer.h"
89 #include "net/base/network_change_notifier.h" 86 #include "net/base/network_change_notifier.h"
90 #include "net/url_request/url_request_context.h" 87 #include "net/url_request/url_request_context.h"
91 #include "net/url_request/url_request_context_getter.h" 88 #include "net/url_request/url_request_context_getter.h"
92 #include "url/gurl.h"
93 89
94 #if defined(USE_ATHENA) 90 #if defined(USE_ATHENA)
95 #include "athena/main/public/athena_launcher.h" 91 #include "athena/main/public/athena_launcher.h"
96 #endif 92 #endif
97 93
98 using content::BrowserThread; 94 using content::BrowserThread;
99 95
100 namespace { 96 namespace {
101 97
102 void LogCustomSwitches(const std::set<std::string>& switches) { 98 void LogCustomSwitches(const std::set<std::string>& switches) {
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 182
187 // LoginUtils implementation: 183 // LoginUtils implementation:
188 virtual void DoBrowserLaunch(Profile* profile, 184 virtual void DoBrowserLaunch(Profile* profile,
189 LoginDisplayHost* login_host) override; 185 LoginDisplayHost* login_host) override;
190 virtual void PrepareProfile( 186 virtual void PrepareProfile(
191 const UserContext& user_context, 187 const UserContext& user_context,
192 bool has_auth_cookies, 188 bool has_auth_cookies,
193 bool has_active_session, 189 bool has_active_session,
194 LoginUtils::Delegate* delegate) override; 190 LoginUtils::Delegate* delegate) override;
195 virtual void DelegateDeleted(LoginUtils::Delegate* delegate) override; 191 virtual void DelegateDeleted(LoginUtils::Delegate* delegate) override;
196 virtual void CompleteOffTheRecordLogin(const GURL& start_url) override;
197 virtual scoped_refptr<Authenticator> CreateAuthenticator( 192 virtual scoped_refptr<Authenticator> CreateAuthenticator(
198 AuthStatusConsumer* consumer) override; 193 AuthStatusConsumer* consumer) override;
199 virtual bool RestartToApplyPerSessionFlagsIfNeed(Profile* profile, 194 virtual bool RestartToApplyPerSessionFlagsIfNeed(Profile* profile,
200 bool early_restart) override; 195 bool early_restart) override;
201 196
202 // UserSessionManager::Delegate implementation: 197 // UserSessionManager::Delegate implementation:
203 virtual void OnProfilePrepared(Profile* profile) override; 198 virtual void OnProfilePrepared(Profile* profile) override;
204 #if defined(ENABLE_RLZ) 199 #if defined(ENABLE_RLZ)
205 virtual void OnRlzInitialized() override; 200 virtual void OnRlzInitialized() override;
206 #endif 201 #endif
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 CommandLine::StringVector flags; 392 CommandLine::StringVector flags;
398 // argv[0] is the program name |CommandLine::NO_PROGRAM|. 393 // argv[0] is the program name |CommandLine::NO_PROGRAM|.
399 flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end()); 394 flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end());
400 VLOG(1) << "Restarting to apply per-session flags..."; 395 VLOG(1) << "Restarting to apply per-session flags...";
401 DBusThreadManager::Get()->GetSessionManagerClient()->SetFlagsForUser( 396 DBusThreadManager::Get()->GetSessionManagerClient()->SetFlagsForUser(
402 user_manager::UserManager::Get()->GetActiveUser()->email(), flags); 397 user_manager::UserManager::Get()->GetActiveUser()->email(), flags);
403 AttemptRestart(profile); 398 AttemptRestart(profile);
404 return true; 399 return true;
405 } 400 }
406 401
407 void LoginUtilsImpl::CompleteOffTheRecordLogin(const GURL& start_url) {
408 VLOG(1) << "Completing incognito login";
409
410 // For guest session we ask session manager to restart Chrome with --bwsi
411 // flag. We keep only some of the arguments of this process.
412 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
413 CommandLine command_line(browser_command_line.GetProgram());
414 std::string cmd_line_str =
415 GetOffTheRecordCommandLine(start_url,
416 StartupUtils::IsOobeCompleted(),
417 browser_command_line,
418 &command_line);
419
420 // This makes sure that Chrome restarts with no per-session flags. The guest
421 // profile will always have empty set of per-session flags. If this is not
422 // done and device owner has some per-session flags, when Chrome is relaunched
423 // the guest profile session flags will not match the current command line and
424 // another restart will be attempted in order to reset the user flags for the
425 // guest user.
426 const CommandLine user_flags(CommandLine::NO_PROGRAM);
427 if (!about_flags::AreSwitchesIdenticalToCurrentCommandLine(
428 user_flags,
429 *CommandLine::ForCurrentProcess(),
430 NULL)) {
431 DBusThreadManager::Get()->GetSessionManagerClient()->SetFlagsForUser(
432 chromeos::login::kGuestUserName,
433 CommandLine::StringVector());
434 }
435
436 RestartChrome(cmd_line_str);
437 }
438
439 scoped_refptr<Authenticator> LoginUtilsImpl::CreateAuthenticator( 402 scoped_refptr<Authenticator> LoginUtilsImpl::CreateAuthenticator(
440 AuthStatusConsumer* consumer) { 403 AuthStatusConsumer* consumer) {
441 // Screen locker needs new Authenticator instance each time. 404 // Screen locker needs new Authenticator instance each time.
442 if (ScreenLocker::default_screen_locker()) { 405 if (ScreenLocker::default_screen_locker()) {
443 if (authenticator_.get()) 406 if (authenticator_.get())
444 authenticator_->SetConsumer(NULL); 407 authenticator_->SetConsumer(NULL);
445 authenticator_ = NULL; 408 authenticator_ = NULL;
446 } 409 }
447 410
448 if (authenticator_.get() == NULL) { 411 if (authenticator_.get() == NULL) {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 CrosSettings* cros_settings = CrosSettings::Get(); 482 CrosSettings* cros_settings = CrosSettings::Get();
520 bool allow_new_user = false; 483 bool allow_new_user = false;
521 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); 484 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
522 if (allow_new_user) 485 if (allow_new_user)
523 return true; 486 return true;
524 return cros_settings->FindEmailInList( 487 return cros_settings->FindEmailInList(
525 kAccountsPrefUsers, username, wildcard_match); 488 kAccountsPrefUsers, username, wildcard_match);
526 } 489 }
527 490
528 } // namespace chromeos 491 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698