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

Unified Diff: chrome/browser/ui/app_list/app_list_view_delegate.h

Issue 309443002: Remove need to sign in to use the App Launcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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/ui/app_list/app_list_view_delegate.h
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.h b/chrome/browser/ui/app_list/app_list_view_delegate.h
index 60026af103cd7708f720591a0d3c8a65a6736677..81a7e962e49d0672fefd69edf82d8888e1692c93 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.h
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.h
@@ -12,13 +12,9 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
-#include "base/scoped_observer.h"
#include "chrome/browser/profiles/profile_info_cache_observer.h"
#include "chrome/browser/search/hotword_client.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/ui/app_list/chrome_signin_delegate.h"
#include "chrome/browser/ui/app_list/start_page_observer.h"
-#include "components/signin/core/browser/signin_manager_base.h"
#include "ui/app_list/app_list_view_delegate.h"
class AppListControllerDelegate;
@@ -44,9 +40,7 @@ class AppSyncUIStateWatcher;
class AppListViewDelegate : public app_list::AppListViewDelegate,
public app_list::StartPageObserver,
public HotwordClient,
- public ProfileInfoCacheObserver,
- public SigninManagerBase::Observer,
- public SigninManagerFactory::Observer {
+ public ProfileInfoCacheObserver {
public:
AppListViewDelegate(Profile* profile,
AppListControllerDelegate* controller);
@@ -60,7 +54,6 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
virtual bool ForceNativeDesktop() const OVERRIDE;
virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE;
virtual app_list::AppListModel* GetModel() OVERRIDE;
- virtual app_list::SigninDelegate* GetSigninDelegate() OVERRIDE;
virtual app_list::SpeechUIModel* GetSpeechUI() OVERRIDE;
virtual void GetShortcutPathForApp(
const std::string& app_id,
@@ -105,16 +98,6 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
virtual void OnHotwordStateChanged(bool started) OVERRIDE;
virtual void OnHotwordRecognized() OVERRIDE;
- // Overridden from SigninManagerFactory::Observer:
- virtual void SigninManagerCreated(SigninManagerBase* manager) OVERRIDE;
- virtual void SigninManagerShutdown(SigninManagerBase* manager) OVERRIDE;
-
- // Overridden from SigninManagerBase::Observer:
- virtual void GoogleSigninFailed(const GoogleServiceAuthError& error) OVERRIDE;
- virtual void GoogleSigninSucceeded(const std::string& username,
- const std::string& password) OVERRIDE;
- virtual void GoogleSignedOut(const std::string& username) OVERRIDE;
-
// Overridden from ProfileInfoCacheObserver:
virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE;
virtual void OnProfileWasRemoved(const base::FilePath& profile_path,
@@ -139,17 +122,12 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
Users users_;
- ChromeSigninDelegate signin_delegate_;
#if defined(USE_ASH)
scoped_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_;
#endif
ObserverList<app_list::AppListViewDelegateObserver> observers_;
- // Used to track the SigninManagers that this instance is observing so that
- // this instance can be removed as an observer on its destruction.
- ScopedObserver<SigninManagerBase, AppListViewDelegate> scoped_observer_;
-
DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate);
};

Powered by Google App Engine
This is Rietveld 408576698