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

Unified Diff: ash/wm/app_list_controller.cc

Issue 14533006: Drag and drop between app list and launcher - First patch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months 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: ash/wm/app_list_controller.cc
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
index 7fcf76c9f1d7e8939a30d2bcf2b7f89567d2b1f4..5a5da0eac30f03d392df88e3cc58a23230cde6cc 100644
--- a/ash/wm/app_list_controller.cc
+++ b/ash/wm/app_list_controller.cc
@@ -100,7 +100,8 @@ AppListController::~AppListController() {
pagination_model_->RemoveObserver(this);
}
-void AppListController::SetVisible(bool visible, aura::Window* window) {
+void AppListController::SetVisible(bool visible,
+ aura::Window* window) {
if (visible == is_visible_)
return;
@@ -139,6 +140,12 @@ aura::Window* AppListController::GetWindow() {
return is_visible_ && view_ ? view_->GetWidget()->GetNativeWindow() : NULL;
}
+void AppListController::SetAppListDnDHost(
+ app_list::ApplicationDnDHost* dnd_host) {
+ if (view_ && is_visible_)
+ view_->SetAppListDnDHost(dnd_host);
+}
+
////////////////////////////////////////////////////////////////////////////////
// AppListController, private:

Powered by Google App Engine
This is Rietveld 408576698