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

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

Issue 11371003: app_list: Add sync animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix missed init Created 8 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 56ff598a473edc66026276a2e5e581d981fa6bb9..efdc66fb92478a8b45d52f12a8ada1bae47efd29 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -10,6 +10,10 @@
#include "chrome/browser/ui/app_list/search_builder.h"
#include "content/public/browser/user_metrics.h"
+#if defined(USE_ASH)
+#include "chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h"
+#endif
+
AppListViewDelegate::AppListViewDelegate(AppListControllerDelegate* controller)
: controller_(controller) {}
@@ -27,9 +31,15 @@ void AppListViewDelegate::SetModel(app_list::AppListModel* model) {
model->search_box(),
model->results(),
controller_.get()));
+#if defined(USE_ASH)
+ app_sync_ui_state_watcher_.reset(new AppSyncUIStateWatcher(profile, model));
+#endif
} else {
apps_builder_.reset();
search_builder_.reset();
+#if defined(USE_ASH)
+ app_sync_ui_state_watcher_.reset();
+#endif
}
}
« no previous file with comments | « chrome/browser/ui/app_list/app_list_view_delegate.h ('k') | chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698