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

Unified Diff: ash/shelf/shelf_layout_manager.h

Issue 2093283002: mash: Convert all of //ash/system to use WmShelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index 9af25e391b0cd5e3a906edc0d49b3ea0f2690893..732fbeda31114207cf217b354d2024c362bafab5 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -210,6 +210,7 @@ class ASH_EXPORT ShelfLayoutManager
friend class PanelLayoutManagerTest;
friend class ShelfLayoutManagerTest;
friend class ToastManagerTest;
+ friend class WmShelfAura;
James Cook 2016/06/24 23:20:08 For OnKeyboardBoundsChanging(), and I suspect a fe
msw 2016/06/25 00:18:29 Maybe move that to public or something like shelf_
James Cook 2016/06/25 01:20:58 Moved it to public and reordered definition in .cc
FRIEND_TEST_ALL_PREFIXES(ash::AshPopupAlignmentDelegateTest, AutoHide);
FRIEND_TEST_ALL_PREFIXES(ash::WebNotificationTrayTest, PopupAndFullscreen);

Powered by Google App Engine
This is Rietveld 408576698