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

Side by Side Diff: ash/test/shelf_test_api.h

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content 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
« no previous file with comments | « ash/sysui/shell_delegate_mus.cc ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_TEST_SHELF_TEST_API_H_ 5 #ifndef ASH_TEST_SHELF_TEST_API_H_
6 #define ASH_TEST_SHELF_TEST_API_H_ 6 #define ASH_TEST_SHELF_TEST_API_H_
7 7
8 #include "ash/shelf/shelf.h" 8 #include "ash/shelf/shelf.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 10
11 namespace ash { 11 namespace ash {
12 namespace test { 12 namespace test {
13 13
14 // Use the api in this class to access private members of Shelf. 14 // Use the api in this class to access private members of Shelf.
15 class ShelfTestAPI { 15 class ShelfTestAPI {
16 public: 16 public:
17 explicit ShelfTestAPI(Shelf* shelf) : shelf_(shelf) {} 17 explicit ShelfTestAPI(Shelf* shelf) : shelf_(shelf) {}
18 ~ShelfTestAPI() {} 18 ~ShelfTestAPI() {}
19 19
20 WmShelf* wm_shelf() { return shelf_->wm_shelf_; }
21
20 ShelfView* shelf_view() { return shelf_->shelf_view_; } 22 ShelfView* shelf_view() { return shelf_->shelf_view_; }
21 23
22 ShelfLockingManager* shelf_locking_manager() { 24 ShelfLockingManager* shelf_locking_manager() {
23 return &shelf_->shelf_locking_manager_; 25 return &shelf_->shelf_locking_manager_;
24 } 26 }
25 27
26 void set_delegate(ShelfDelegate* delegate) { shelf_->delegate_ = delegate; } 28 void set_delegate(ShelfDelegate* delegate) { shelf_->delegate_ = delegate; }
27 29
28 private: 30 private:
29 Shelf* shelf_; 31 Shelf* shelf_;
30 32
31 DISALLOW_COPY_AND_ASSIGN(ShelfTestAPI); 33 DISALLOW_COPY_AND_ASSIGN(ShelfTestAPI);
32 }; 34 };
33 35
34 } // namespace test 36 } // namespace test
35 } // namespace ash 37 } // namespace ash
36 38
37 #endif // ASH_TEST_SHELF_TEST_API_H_ 39 #endif // ASH_TEST_SHELF_TEST_API_H_
OLDNEW
« no previous file with comments | « ash/sysui/shell_delegate_mus.cc ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698