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

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

Issue 2761373002: Move yet more from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 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/wm/ash_focus_rules_unittest.cc » ('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 #include "ash/common/palette_delegate.h" 7 #include "ash/common/palette_delegate.h"
7 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/shelf/shelf_delegate.h"
8 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
9 #include "ash/shell.h" 11 #include "ash/shell.h"
10 12
11 namespace ash { 13 namespace ash {
12 namespace test { 14 namespace test {
13 15
14 ShellTestApi::ShellTestApi() : ShellTestApi(Shell::GetInstance()) {} 16 ShellTestApi::ShellTestApi() : ShellTestApi(Shell::GetInstance()) {}
15 17
16 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} 18 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
17 19
(...skipping 20 matching lines...) Expand all
38 void ShellTestApi::SetPaletteDelegate( 40 void ShellTestApi::SetPaletteDelegate(
39 std::unique_ptr<PaletteDelegate> palette_delegate) { 41 std::unique_ptr<PaletteDelegate> palette_delegate) {
40 shell_->palette_delegate_ = std::move(palette_delegate); 42 shell_->palette_delegate_ = std::move(palette_delegate);
41 } 43 }
42 44
43 void ShellTestApi::SetSessionStateDelegate( 45 void ShellTestApi::SetSessionStateDelegate(
44 SessionStateDelegate* session_state_delegate) { 46 SessionStateDelegate* session_state_delegate) {
45 shell_->session_state_delegate_.reset(session_state_delegate); 47 shell_->session_state_delegate_.reset(session_state_delegate);
46 } 48 }
47 49
50 void ShellTestApi::SetShelfDelegate(
51 std::unique_ptr<ShelfDelegate> test_delegate) {
52 shell_->shelf_delegate_ = std::move(test_delegate);
53 }
54
48 } // namespace test 55 } // namespace test
49 } // namespace ash 56 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/wm/ash_focus_rules_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698