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

Unified Diff: ash/shelf/shelf_view.h

Issue 2975063003: [Merge M60] Fix shelf dragging context in case Context Menu is shown. (Closed)
Patch Set: Created 3 years, 5 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
« no previous file with comments | « ash/shelf/shelf_button.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.h
diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
index 50656eac6a156e5f8e7a2e24890a518c95e68ff0..825a1de8d838e1ef26bb83130ebcab444e5ada7e 100644
--- a/ash/shelf/shelf_view.h
+++ b/ash/shelf/shelf_view.h
@@ -169,6 +169,8 @@ class ASH_EXPORT ShelfView : public views::View,
// the overflow shelf.
ShelfView* main_shelf() { return main_shelf_; }
+ const ShelfButton* drag_view() const { return drag_view_; }
+
private:
friend class ash::test::ShelfViewTestAPI;
« no previous file with comments | « ash/shelf/shelf_button.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698