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

Side by Side Diff: ash/test/shell_test_api.cc

Issue 2791463002: mash: Remove ShelfDelegate; move functions to ShelfModel. (Closed)
Patch Set: Address comment. Created 3 years, 8 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/test/shell_test_api.h ('k') | ash/test/test_shelf_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "ash/test/shell_test_api.h" 5 #include "ash/test/shell_test_api.h"
6 6
7 #include "ash/palette_delegate.h" 7 #include "ash/palette_delegate.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/session/session_state_delegate.h" 9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shelf/shelf_delegate.h"
11 #include "ash/shell.h" 10 #include "ash/shell.h"
12 11
13 namespace ash { 12 namespace ash {
14 namespace test { 13 namespace test {
15 14
16 ShellTestApi::ShellTestApi() : ShellTestApi(Shell::Get()) {} 15 ShellTestApi::ShellTestApi() : ShellTestApi(Shell::Get()) {}
17 16
18 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} 17 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
19 18
20 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() { 19 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() {
(...skipping 19 matching lines...) Expand all
40 void ShellTestApi::SetPaletteDelegate( 39 void ShellTestApi::SetPaletteDelegate(
41 std::unique_ptr<PaletteDelegate> palette_delegate) { 40 std::unique_ptr<PaletteDelegate> palette_delegate) {
42 shell_->palette_delegate_ = std::move(palette_delegate); 41 shell_->palette_delegate_ = std::move(palette_delegate);
43 } 42 }
44 43
45 void ShellTestApi::SetSessionStateDelegate( 44 void ShellTestApi::SetSessionStateDelegate(
46 SessionStateDelegate* session_state_delegate) { 45 SessionStateDelegate* session_state_delegate) {
47 shell_->session_state_delegate_.reset(session_state_delegate); 46 shell_->session_state_delegate_.reset(session_state_delegate);
48 } 47 }
49 48
50 void ShellTestApi::SetShelfDelegate(
51 std::unique_ptr<ShelfDelegate> test_delegate) {
52 shell_->shelf_delegate_ = std::move(test_delegate);
53 }
54
55 } // namespace test 49 } // namespace test
56 } // namespace ash 50 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/test/test_shelf_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698