| 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 1eb50ba929266252317277b68ec9eed3c40478db..906d54c36296b120ed8803445a8eeaaff728fbe5 100644
|
| --- a/chrome/browser/ui/app_list/app_list_view_delegate.h
|
| +++ b/chrome/browser/ui/app_list/app_list_view_delegate.h
|
| @@ -31,6 +31,7 @@ class CustomLauncherPageContents;
|
| }
|
|
|
| namespace app_list {
|
| +class LauncherPageEventDispatcherViews;
|
| class SearchController;
|
| class SearchResourceManager;
|
| class SpeechUIModel;
|
| @@ -84,6 +85,7 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
|
| base::TimeDelta GetAutoLaunchTimeout() override;
|
| void AutoLaunchCanceled() override;
|
| void ViewInitialized() override;
|
| + void ViewReinitializedForProfileChange() override;
|
| void Dismiss() override;
|
| void ViewClosing() override;
|
| gfx::ImageSkia GetWindowIcon() override;
|
| @@ -113,6 +115,9 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
|
| // Updates the app list's custom launcher pages for the current |profile_|.
|
| void SetUpCustomLauncherPages();
|
|
|
| + // Attaches the launcher page event dispatcher to the custom launcher page.
|
| + void AttachLauncherPageEventDispatcher();
|
| +
|
| // Overridden from app_list::StartPageObserver:
|
| void OnSpeechResult(const base::string16& result, bool is_final) override;
|
| void OnSpeechSoundLevelChanged(int16 level) override;
|
| @@ -179,6 +184,12 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
|
| // Window contents of additional custom launcher pages.
|
| ScopedVector<apps::CustomLauncherPageContents> custom_page_contents_;
|
|
|
| +#if defined(TOOLKIT_VIEWS)
|
| + // Observes the app list to send events to the launcher page.
|
| + scoped_ptr<app_list::LauncherPageEventDispatcherViews>
|
| + launcher_page_event_dispatcher_;
|
| +#endif
|
| +
|
| // Registers for NOTIFICATION_APP_TERMINATING to unload custom launcher pages.
|
| content::NotificationRegistrar registrar_;
|
|
|
|
|