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

Unified 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: Add GoodiesDisplayer::Delegate for future testing 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/session/user_session_manager.h
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h
index dee2273dc6aeb43664101d8e7e5f75b17a3e8abb..681aec351f3ab226b2f9b5078ccaa5cb024f5c69 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.h
+++ b/chrome/browser/chromeos/login/session/user_session_manager.h
@@ -14,6 +14,7 @@
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "chrome/browser/chromeos/base/locale_util.h"
+#include "chrome/browser/chromeos/first_run/goodies_displayer.h"
#include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
#include "chrome/browser/chromeos/login/signin/token_handle_util.h"
#include "chromeos/dbus/session_manager_client.h"
@@ -40,6 +41,10 @@ class User;
namespace chromeos {
+namespace first_run {
+class GoodiesDisplayer;
+} // namespace first_run
+
namespace test {
class UserSessionManagerTestApi;
} // namespace test
@@ -79,6 +84,7 @@ class UserSessionStateObserver {
class UserSessionManager
: public OAuth2LoginManager::Observer,
public net::NetworkChangeNotifier::ConnectionTypeObserver,
+ public first_run::GoodiesDisplayer::Delegate,
achuithb 2015/09/18 16:39:11 You cannot inherit from an implementation class. T
Greg Levin 2015/09/18 18:49:27 Done... moved functionality into member scoped_ptr
public base::SupportsWeakPtr<UserSessionManager>,
public UserSessionManagerDelegate,
public user_manager::UserManager::UserSessionStateObserver {

Powered by Google App Engine
This is Rietveld 408576698