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

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

Issue 2127713005: Purge AppListMenu, and the app list profile switcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160707-Apps-RemoveSettings
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/app_list_view_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3346029c20f854d92ffc0c1afe9a48839ba09eed..323868d2e71126cc37d6023e16ae200f39b36bbc 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.h
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.h
@@ -15,17 +15,10 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
-#include "base/observer_list.h"
-#include "base/scoped_observer.h"
-#include "chrome/browser/profiles/profile_attributes_storage.h"
#include "chrome/browser/search/hotword_client.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/ui/app_list/start_page_observer.h"
#include "components/search_engines/template_url_service.h"
#include "components/search_engines/template_url_service_observer.h"
-#include "components/signin/core/browser/signin_manager_base.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
#include "ui/app_list/app_list_view_delegate.h"
class AppListControllerDelegate;
@@ -61,10 +54,6 @@ class AppSyncUIStateWatcher;
class AppListViewDelegate : public app_list::AppListViewDelegate,
public app_list::StartPageObserver,
public HotwordClient,
- public ProfileAttributesStorage::Observer,
- public SigninManagerBase::Observer,
- public SigninManagerFactory::Observer,
- public content::NotificationObserver,
public TemplateURLServiceObserver {
public:
// Constructs Chrome's AppListViewDelegate with a NULL Profile.
@@ -101,8 +90,6 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
void ViewInitialized() override;
void Dismiss() override;
void ViewClosing() override;
- void OpenHelp() override;
- void OpenFeedback() override;
void StartSpeechRecognition() override;
void StopSpeechRecognition() override;
void ShowForProfileByPath(const base::FilePath& profile_path) override;
@@ -114,10 +101,7 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
void CustomLauncherPagePopSubpage() override;
#endif
bool IsSpeechRecognitionEnabled() override;
- const Users& GetUsers() const override;
bool ShouldCenterWindow() const override;
- void AddObserver(app_list::AppListViewDelegateObserver* observer) override;
- void RemoveObserver(app_list::AppListViewDelegateObserver* observer) override;
#if !defined(OS_CHROMEOS)
base::string16 GetMessageTitle() const override;
base::string16 GetMessageText(size_t* message_break) const override;
@@ -153,25 +137,6 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
const scoped_refptr<content::SpeechRecognitionSessionPreamble>& preamble)
override;
- // Overridden from SigninManagerFactory::Observer:
- void SigninManagerCreated(SigninManagerBase* manager) override;
- void SigninManagerShutdown(SigninManagerBase* manager) override;
-
- // Overridden from SigninManagerBase::Observer:
- void GoogleSigninFailed(const GoogleServiceAuthError& error) override;
- void GoogleSigninSucceeded(const std::string& account_id,
- const std::string& username,
- const std::string& password) override;
- void GoogleSignedOut(const std::string& account_id,
- const std::string& username) override;
-
- // Overridden from ProfileAttributesStorage::Observer:
- void OnProfileAdded(const base::FilePath& profile_path) override;
- void OnProfileWasRemoved(const base::FilePath& profile_path,
- const base::string16& profile_name) override;
- void OnProfileNameChanged(const base::FilePath& profile_path,
- const base::string16& old_profile_name) override;
-
// Overridden from content::NotificationObserver:
void Observe(int type,
const content::NotificationSource& source,
@@ -199,27 +164,16 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
// Determines whether the current search was initiated by speech.
bool is_voice_query_;
- Users users_;
-
#if defined(USE_ASH)
std::unique_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_;
#endif
- base::ObserverList<app_list::AppListViewDelegateObserver> observers_;
-
ScopedObserver<TemplateURLService, AppListViewDelegate>
template_url_service_observer_;
- // 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_;
-
// Window contents of additional custom launcher pages.
ScopedVector<apps::CustomLauncherPageContents> custom_page_contents_;
- // Registers for NOTIFICATION_APP_TERMINATING to unload custom launcher pages.
- content::NotificationRegistrar registrar_;
-
DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate);
};
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/app_list_view_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698