Chromium Code Reviews| Index: chrome/browser/ui/app_list/app_list_view_delegate.cc |
| diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc |
| index c62666cc116babbc1ed5d7f09be697a07e711aad..58d66e31c10a69774fd077623130e9ea53de8859 100644 |
| --- a/chrome/browser/ui/app_list/app_list_view_delegate.cc |
| +++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc |
| @@ -23,6 +23,7 @@ |
| #include "chrome/browser/ui/app_list/app_list_service.h" |
| #include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
| #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" |
| +#include "chrome/browser/ui/app_list/launcher_page_event_dispatcher.h" |
| #include "chrome/browser/ui/app_list/search/search_controller_factory.h" |
| #include "chrome/browser/ui/app_list/search/search_resource_manager.h" |
| #include "chrome/browser/ui/app_list/start_page_service.h" |
| @@ -298,6 +299,13 @@ void AppListViewDelegate::SetUpCustomLauncherPages() { |
| page_contents->Initialize(profile_, *it); |
| custom_page_contents_.push_back(page_contents); |
| } |
| + |
| + // Only the first custom launcher page gets events dispatched to it. |
| + if (!custom_launcher_page_urls.empty()) { |
| + launcher_page_event_dispatcher_.reset( |
| + new app_list::LauncherPageEventDispatcher( |
| + profile_, custom_launcher_page_urls[0].host())); |
| + } |
| } |
| void AppListViewDelegate::OnHotwordStateChanged(bool started) { |
| @@ -632,6 +640,10 @@ std::vector<views::View*> AppListViewDelegate::CreateCustomPageWebViews( |
| return web_views; |
| } |
| + |
| +void AppListViewDelegate::CustomLauncherPageAnimationChanged(double progress) { |
| + launcher_page_event_dispatcher_->ProgressChanged(progress); |
|
tapted
2014/11/06 06:05:45
if (launcher_page_event_dispatcher_) ?
calamity
2014/11/07 03:43:29
Done.
|
| +} |
| #endif |
| bool AppListViewDelegate::IsSpeechRecognitionEnabled() { |