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

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

Issue 683703002: Notify launcher page with onTransitionChanged event (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@launcher_page_api_show_state_notify
Patch Set: fix mac compile Created 6 years, 1 month 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.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..cb0f18bfb42228a5dfa5b16e409809d08d01fc99 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"
@@ -211,6 +212,7 @@ void AppListViewDelegate::SetProfile(Profile* new_profile) {
// be destroyed first.
search_resource_manager_.reset();
search_controller_.reset();
+ launcher_page_event_dispatcher_.reset();
custom_page_contents_.clear();
app_list::StartPageService* start_page_service =
app_list::StartPageService::Get(profile_);
@@ -286,6 +288,9 @@ void AppListViewDelegate::SetUpProfileSwitcher() {
void AppListViewDelegate::SetUpCustomLauncherPages() {
std::vector<GURL> custom_launcher_page_urls;
GetCustomLauncherPageUrls(profile_, &custom_launcher_page_urls);
+ if (custom_launcher_page_urls.empty())
+ return;
+
for (std::vector<GURL>::const_iterator it = custom_launcher_page_urls.begin();
it != custom_launcher_page_urls.end();
++it) {
@@ -298,6 +303,11 @@ 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.
+ launcher_page_event_dispatcher_.reset(
+ new app_list::LauncherPageEventDispatcher(
+ profile_, custom_launcher_page_urls[0].host()));
}
void AppListViewDelegate::OnHotwordStateChanged(bool started) {
@@ -632,6 +642,11 @@ std::vector<views::View*> AppListViewDelegate::CreateCustomPageWebViews(
return web_views;
}
+
+void AppListViewDelegate::CustomLauncherPageAnimationChanged(double progress) {
+ if (launcher_page_event_dispatcher_)
+ launcher_page_event_dispatcher_->ProgressChanged(progress);
+}
#endif
bool AppListViewDelegate::IsSpeechRecognitionEnabled() {
« no previous file with comments | « chrome/browser/ui/app_list/app_list_view_delegate.h ('k') | chrome/browser/ui/app_list/launcher_page_event_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698