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

Unified Diff: ash/common/shelf/shelf_view.cc

Issue 2290603002: Enhance chrome.app.window API for shelf integration with pinning support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/common/shelf/shelf_view.cc
diff --git a/ash/common/shelf/shelf_view.cc b/ash/common/shelf/shelf_view.cc
index 969d55e38794560b604926a392a62d9328e164fa..e8f53eafb9227e1630e8e31218007657abf889f8 100644
--- a/ash/common/shelf/shelf_view.cc
+++ b/ash/common/shelf/shelf_view.cc
@@ -696,8 +696,8 @@ bool ShelfView::StartDrag(const std::string& app_id,
CancelDrag(-1);
drag_and_drop_item_pinned_ = false;
drag_and_drop_app_id_ = app_id;
- drag_and_drop_shelf_id_ =
- delegate_->GetShelfIDForAppID(drag_and_drop_app_id_);
+ drag_and_drop_shelf_id_ = delegate_->GetShelfIDForAppID(
+ drag_and_drop_app_id_, drag_and_drop_app_id_);
stevenjb 2016/08/29 15:56:30 If we use a single method, we should use "" for th
Andra Paraschiv 2016/08/30 09:58:24 Done.
// Check if the application is known and pinned - if not, we have to pin it so
// that we can re-arrange the shelf order accordingly. Note that items have
// to be pinned to give them the same (order) possibilities as a shortcut.
@@ -706,8 +706,8 @@ bool ShelfView::StartDrag(const std::string& app_id,
if (!IsShowingOverflowBubble() &&
(!drag_and_drop_shelf_id_ || !delegate_->IsAppPinned(app_id))) {
delegate_->PinAppWithID(app_id);
- drag_and_drop_shelf_id_ =
- delegate_->GetShelfIDForAppID(drag_and_drop_app_id_);
+ drag_and_drop_shelf_id_ = delegate_->GetShelfIDForAppID(
+ drag_and_drop_app_id_, drag_and_drop_app_id_);
if (!drag_and_drop_shelf_id_)
return false;
drag_and_drop_item_pinned_ = true;

Powered by Google App Engine
This is Rietveld 408576698