| 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 9df40148a12a8e706c5d745c7b79448f9a204c49..e7d0d9ca2e79818cea3d0114ae4b00a492cc4025 100644
|
| --- a/chrome/browser/ui/app_list/app_list_view_delegate.h
|
| +++ b/chrome/browser/ui/app_list/app_list_view_delegate.h
|
| @@ -11,25 +11,18 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/callback_forward.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.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;
|
| -class Profile;
|
| -
|
| namespace app_list {
|
| class CustomLauncherPageContents;
|
| class LauncherPageEventDispatcher;
|
| @@ -38,24 +31,17 @@ class SearchResourceManager;
|
| class SpeechUIModel;
|
| }
|
|
|
| -namespace base {
|
| -class FilePath;
|
| -}
|
| -
|
| namespace content {
|
| struct SpeechRecognitionSessionPreamble;
|
| }
|
|
|
| -#if defined(USE_ASH)
|
| +class AppListControllerDelegate;
|
| class AppSyncUIStateWatcher;
|
| -#endif
|
| +class Profile;
|
|
|
| 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:
|
| @@ -73,8 +59,6 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
|
| const scoped_refptr<content::SpeechRecognitionSessionPreamble>& preamble);
|
|
|
| // Overridden from app_list::AppListViewDelegate:
|
| - bool ForceNativeDesktop() const override;
|
| - void SetProfileByPath(const base::FilePath& profile_path) override;
|
| app_list::AppListModel* GetModel() override;
|
| app_list::SpeechUIModel* GetSpeechUI() override;
|
| void StartSearch() override;
|
| @@ -90,20 +74,14 @@ 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;
|
| -#if defined(TOOLKIT_VIEWS)
|
| views::View* CreateStartPageWebView(const gfx::Size& size) override;
|
| std::vector<views::View*> CreateCustomPageWebViews(
|
| const gfx::Size& size) override;
|
| void CustomLauncherPageAnimationChanged(double progress) override;
|
| void CustomLauncherPagePopSubpage() override;
|
| -#endif
|
| bool IsSpeechRecognitionEnabled() override;
|
| - const Users& GetUsers() const override;
|
|
|
| // Overridden from TemplateURLServiceObserver:
|
| void OnTemplateURLServiceChanged() override;
|
| @@ -112,9 +90,6 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
|
| // Updates the speech webview and start page for the current |profile_|.
|
| void SetUpSearchUI();
|
|
|
| - // Updates the app list's ProfileMenuItems for the current |profile_|.
|
| - void SetUpProfileSwitcher();
|
| -
|
| // Updates the app list's custom launcher pages for the current |profile_|.
|
| void SetUpCustomLauncherPages();
|
|
|
| @@ -130,25 +105,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,
|
| @@ -176,19 +132,11 @@ 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
|
|
|
| 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.
|
| std::vector<std::unique_ptr<app_list::CustomLauncherPageContents>>
|
| custom_page_contents_;
|
|
|