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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_H_ 5 #ifndef ASH_SHELF_SHELF_H_
6 #define ASH_SHELF_SHELF_H_ 6 #define ASH_SHELF_SHELF_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 11
12 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
13 #include "ash/common/shelf/shelf_constants.h" 13 #include "ash/common/shelf/shelf_constants.h"
14 #include "ash/common/shelf/shelf_locking_manager.h"
14 #include "ash/common/shelf/shelf_types.h" 15 #include "ash/common/shelf/shelf_types.h"
15 #include "ash/shelf/shelf_locking_manager.h"
16 #include "ash/shelf/shelf_widget.h" 16 #include "ash/shelf/shelf_widget.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "ui/gfx/geometry/size.h" 18 #include "ui/gfx/geometry/size.h"
19 #include "ui/views/widget/widget_observer.h" 19 #include "ui/views/widget/widget_observer.h"
20 20
21 namespace app_list { 21 namespace app_list {
22 class ApplicationDragAndDropHost; 22 class ApplicationDragAndDropHost;
23 } 23 }
24 24
25 namespace aura { 25 namespace aura {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 return shelf_widget_->shelf_layout_manager(); 146 return shelf_widget_->shelf_layout_manager();
147 } 147 }
148 148
149 // Returns rectangle bounding all visible shelf items. Used screen coordinate 149 // Returns rectangle bounding all visible shelf items. Used screen coordinate
150 // system. 150 // system.
151 gfx::Rect GetVisibleItemsBoundsInScreen() const; 151 gfx::Rect GetVisibleItemsBoundsInScreen() const;
152 152
153 // Returns ApplicationDragAndDropHost for this shelf. 153 // Returns ApplicationDragAndDropHost for this shelf.
154 app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList(); 154 app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList();
155 155
156 ShelfLockingManager* shelf_locking_manager_for_testing() {
157 return &shelf_locking_manager_;
158 }
159
156 private: 160 private:
157 friend class test::ShelfTestAPI; 161 friend class test::ShelfTestAPI;
158 162
159 ShelfDelegate* delegate_; 163 ShelfDelegate* delegate_;
160 // The shelf controller. Owned by the root window controller. 164 // The shelf controller. Owned by the root window controller.
161 WmShelf* wm_shelf_; 165 WmShelf* wm_shelf_;
162 ShelfWidget* shelf_widget_; 166 ShelfWidget* shelf_widget_;
163 ShelfView* shelf_view_; 167 ShelfView* shelf_view_;
164 ShelfLockingManager shelf_locking_manager_; 168 ShelfLockingManager shelf_locking_manager_;
165 169
166 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM; 170 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM;
167 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER; 171 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
168 172
169 DISALLOW_COPY_AND_ASSIGN(Shelf); 173 DISALLOW_COPY_AND_ASSIGN(Shelf);
170 }; 174 };
171 175
172 } // namespace ash 176 } // namespace ash
173 177
174 #endif // ASH_SHELF_SHELF_H_ 178 #endif // ASH_SHELF_SHELF_H_
OLDNEW
« 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