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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 203
204 private: 204 private:
205 class AutoHideEventFilter; 205 class AutoHideEventFilter;
206 class RootWindowControllerObserverImpl; 206 class RootWindowControllerObserverImpl;
207 class UpdateShelfObserver; 207 class UpdateShelfObserver;
208 friend class AshPopupAlignmentDelegateTest; 208 friend class AshPopupAlignmentDelegateTest;
209 friend class ash::ScreenAsh; 209 friend class ash::ScreenAsh;
210 friend class PanelLayoutManagerTest; 210 friend class PanelLayoutManagerTest;
211 friend class ShelfLayoutManagerTest; 211 friend class ShelfLayoutManagerTest;
212 friend class ToastManagerTest; 212 friend class ToastManagerTest;
213 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
213 FRIEND_TEST_ALL_PREFIXES(ash::AshPopupAlignmentDelegateTest, AutoHide); 214 FRIEND_TEST_ALL_PREFIXES(ash::AshPopupAlignmentDelegateTest, AutoHide);
214 FRIEND_TEST_ALL_PREFIXES(ash::WebNotificationTrayTest, PopupAndFullscreen); 215 FRIEND_TEST_ALL_PREFIXES(ash::WebNotificationTrayTest, PopupAndFullscreen);
215 216
216 struct TargetBounds { 217 struct TargetBounds {
217 TargetBounds(); 218 TargetBounds();
218 ~TargetBounds(); 219 ~TargetBounds();
219 220
220 float opacity; 221 float opacity;
221 float status_opacity; 222 float status_opacity;
222 gfx::Rect shelf_bounds_in_root; 223 gfx::Rect shelf_bounds_in_root;
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 396
396 std::unique_ptr<RootWindowControllerObserverImpl> 397 std::unique_ptr<RootWindowControllerObserverImpl>
397 root_window_controller_observer_; 398 root_window_controller_observer_;
398 399
399 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 400 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
400 }; 401 };
401 402
402 } // namespace ash 403 } // namespace ash
403 404
404 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 405 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698