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

Unified Diff: ash/shelf/shelf.h

Issue 2166043003: mash: Migrate ShelfLockingManager to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ShelfLockingManager test access to Shelf. Created 4 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
Index: ash/shelf/shelf.h
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index a6fee84f7ec77f039683a7392d24b8a58413e588..fab107728e22d381cc6befc4c0cc107ae875b28d 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -11,8 +11,8 @@
#include "ash/ash_export.h"
#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_locking_manager.h"
#include "ash/common/shelf/shelf_types.h"
-#include "ash/shelf/shelf_locking_manager.h"
#include "ash/shelf/shelf_widget.h"
#include "base/macros.h"
#include "ui/gfx/geometry/size.h"
@@ -153,6 +153,10 @@ class ASH_EXPORT Shelf {
// Returns ApplicationDragAndDropHost for this shelf.
app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList();
+ ShelfLockingManager* shelf_locking_manager_for_testing() {
+ return &shelf_locking_manager_;
+ }
+
private:
friend class test::ShelfTestAPI;
« ash/common/wm_shell.h ('K') | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698