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

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

Issue 1308833004: Show Goodies page to new Chromebook users (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reviewer comments: Round 3 Created 5 years, 3 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 <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 22 matching lines...) Expand all
33 namespace net { 33 namespace net {
34 class URLRequestContextGetter; 34 class URLRequestContextGetter;
35 } 35 }
36 36
37 namespace user_manager { 37 namespace user_manager {
38 class User; 38 class User;
39 } // namespace user_manager 39 } // namespace user_manager
40 40
41 namespace chromeos { 41 namespace chromeos {
42 42
43 namespace first_run {
44 class GoodiesDisplayer;
45 } // namespace first_run
achuithb 2015/09/16 21:51:36 Don't need comment
Greg Levin 2015/09/16 22:50:45 Was being stylistically consistent with the one-li
46
43 namespace test { 47 namespace test {
44 class UserSessionManagerTestApi; 48 class UserSessionManagerTestApi;
45 } // namespace test 49 } // namespace test
46 50
47 class EasyUnlockKeyManager; 51 class EasyUnlockKeyManager;
48 class InputEventsBlocker; 52 class InputEventsBlocker;
49 class LoginDisplayHost; 53 class LoginDisplayHost;
50 54
51 class UserSessionManagerDelegate { 55 class UserSessionManagerDelegate {
52 public: 56 public:
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 233
230 // Note this could return NULL if not enabled. 234 // Note this could return NULL if not enabled.
231 EasyUnlockKeyManager* GetEasyUnlockKeyManager(); 235 EasyUnlockKeyManager* GetEasyUnlockKeyManager();
232 236
233 // Update Easy unlock cryptohome keys for given user context. 237 // Update Easy unlock cryptohome keys for given user context.
234 void UpdateEasyUnlockKeys(const UserContext& user_context); 238 void UpdateEasyUnlockKeys(const UserContext& user_context);
235 239
236 // Returns the auth request context associated with auth data. 240 // Returns the auth request context associated with auth data.
237 net::URLRequestContextGetter* GetAuthRequestContext() const; 241 net::URLRequestContextGetter* GetAuthRequestContext() const;
238 242
243 void CreateGoodiesDisplayer();
achuithb 2015/09/16 21:51:36 Please add function comments
Greg Levin 2015/09/16 22:50:45 Done.
244 void DestroyGoodiesDisplayer();
245
239 // Removes a profile from the per-user input methods states map. 246 // Removes a profile from the per-user input methods states map.
240 void RemoveProfileForTesting(Profile* profile); 247 void RemoveProfileForTesting(Profile* profile);
241 248
242 const UserContext& user_context() const { return user_context_; } 249 const UserContext& user_context() const { return user_context_; }
243 bool has_auth_cookies() const { return has_auth_cookies_; } 250 bool has_auth_cookies() const { return has_auth_cookies_; }
244 251
245 void Shutdown(); 252 void Shutdown();
246 253
247 private: 254 private:
248 friend class test::UserSessionManagerTestApi; 255 friend class test::UserSessionManagerTestApi;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 475
469 scoped_ptr<TokenHandleUtil> token_handle_util_; 476 scoped_ptr<TokenHandleUtil> token_handle_util_;
470 scoped_ptr<TokenHandleFetcher> token_handle_fetcher_; 477 scoped_ptr<TokenHandleFetcher> token_handle_fetcher_;
471 478
472 // Whether should launch browser, tests may override this value. 479 // Whether should launch browser, tests may override this value.
473 bool should_launch_browser_; 480 bool should_launch_browser_;
474 481
475 // Child account status is necessary for InitializeStartUrls call. 482 // Child account status is necessary for InitializeStartUrls call.
476 bool waiting_for_child_account_status_; 483 bool waiting_for_child_account_status_;
477 484
485 // Used to display OOBE Goodies page when browser is first opened.
486 scoped_ptr<first_run::GoodiesDisplayer> goodies_displayer_;
487
478 base::WeakPtrFactory<UserSessionManager> weak_factory_; 488 base::WeakPtrFactory<UserSessionManager> weak_factory_;
479 489
480 DISALLOW_COPY_AND_ASSIGN(UserSessionManager); 490 DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
481 }; 491 };
482 492
483 } // namespace chromeos 493 } // namespace chromeos
484 494
485 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 495 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698