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

Side by Side Diff: chrome/browser/chromeos/login/session/user_session_manager.h

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)
Patch Set: Address comments Created 3 years, 11 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 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/singleton.h" 13 #include "base/memory/singleton.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "chrome/browser/chromeos/base/locale_util.h" 16 #include "chrome/browser/chromeos/base/locale_util.h"
17 #include "chrome/browser/chromeos/eol_notification.h" 17 #include "chrome/browser/chromeos/eol_notification.h"
18 #include "chrome/browser/chromeos/hats/hats_notification_controller.h" 18 #include "chrome/browser/chromeos/hats/hats_notification_controller.h"
19 #include "chrome/browser/chromeos/login/oobe_screen.h"
19 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_notification_c ontroller.h" 20 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_notification_c ontroller.h"
20 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" 21 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
21 #include "chrome/browser/chromeos/login/signin/token_handle_util.h" 22 #include "chrome/browser/chromeos/login/signin/token_handle_util.h"
22 #include "chromeos/dbus/session_manager_client.h" 23 #include "chromeos/dbus/session_manager_client.h"
23 #include "chromeos/login/auth/authenticator.h" 24 #include "chromeos/login/auth/authenticator.h"
24 #include "chromeos/login/auth/user_context.h" 25 #include "chromeos/login/auth/user_context.h"
25 #include "components/user_manager/user.h" 26 #include "components/user_manager/user.h"
26 #include "components/user_manager/user_manager.h" 27 #include "components/user_manager/user_manager.h"
27 #include "net/base/network_change_notifier.h" 28 #include "net/base/network_change_notifier.h"
28 #include "ui/base/ime/chromeos/input_method_manager.h" 29 #include "ui/base/ime/chromeos/input_method_manager.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 const AccountId& account_id); 310 const AccountId& account_id);
310 311
311 // Callback to resume profile creation after transferring auth data from 312 // Callback to resume profile creation after transferring auth data from
312 // the authentication profile. 313 // the authentication profile.
313 void CompleteProfileCreateAfterAuthTransfer(Profile* profile); 314 void CompleteProfileCreateAfterAuthTransfer(Profile* profile);
314 315
315 // Finalized profile preparation. 316 // Finalized profile preparation.
316 void FinalizePrepareProfile(Profile* profile); 317 void FinalizePrepareProfile(Profile* profile);
317 318
318 // Starts out-of-box flow with the specified screen. 319 // Starts out-of-box flow with the specified screen.
319 void ActivateWizard(const std::string& screen_name); 320 void ActivateWizard(OobeScreen screen);
320 321
321 // Adds first-time login URLs. 322 // Adds first-time login URLs.
322 void InitializeStartUrls() const; 323 void InitializeStartUrls() const;
323 324
324 // Perform session initialization and either move to additional login flows 325 // Perform session initialization and either move to additional login flows
325 // such as TOS (public sessions), priority pref sync UI (new users) or 326 // such as TOS (public sessions), priority pref sync UI (new users) or
326 // launch browser. 327 // launch browser.
327 // Returns true if browser has been launched or false otherwise. 328 // Returns true if browser has been launched or false otherwise.
328 bool InitializeUserSession(Profile* profile); 329 bool InitializeUserSession(Profile* profile);
329 330
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 hats_notification_controller_; 502 hats_notification_controller_;
502 503
503 base::WeakPtrFactory<UserSessionManager> weak_factory_; 504 base::WeakPtrFactory<UserSessionManager> weak_factory_;
504 505
505 DISALLOW_COPY_AND_ASSIGN(UserSessionManager); 506 DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
506 }; 507 };
507 508
508 } // namespace chromeos 509 } // namespace chromeos
509 510
510 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 511 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698