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

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

Issue 2843193002: chromeos: fix focus for mushrome (Closed)
Patch Set: feedback 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/shell_port.h ('k') | ui/aura/BUILD.gn » ('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_ASH_TEST_HELPER_H_ 5 #ifndef ASH_TEST_ASH_TEST_HELPER_H_
6 #define ASH_TEST_ASH_TEST_HELPER_H_ 6 #define ASH_TEST_ASH_TEST_HELPER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 // Version of DisplayManagerTestApi::UpdateDisplay() for mash. 103 // Version of DisplayManagerTestApi::UpdateDisplay() for mash.
104 void UpdateDisplayForMash(const std::string& display_spec); 104 void UpdateDisplayForMash(const std::string& display_spec);
105 105
106 display::Display GetSecondaryDisplay(); 106 display::Display GetSecondaryDisplay();
107 107
108 // Null in classic ash. 108 // Null in classic ash.
109 mus::WindowManagerApplication* window_manager_app() { 109 mus::WindowManagerApplication* window_manager_app() {
110 return window_manager_app_.get(); 110 return window_manager_app_.get();
111 } 111 }
112 aura::TestWindowTreeClientSetup* window_tree_client_setup() {
113 return &window_tree_client_setup_;
114 }
112 115
113 TestSessionControllerClient* test_session_controller_client() { 116 TestSessionControllerClient* test_session_controller_client() {
114 return session_controller_client_.get(); 117 return session_controller_client_.get();
115 } 118 }
116 void set_test_session_controller_client( 119 void set_test_session_controller_client(
117 std::unique_ptr<TestSessionControllerClient> session_controller_client) { 120 std::unique_ptr<TestSessionControllerClient> session_controller_client) {
118 session_controller_client_ = std::move(session_controller_client); 121 session_controller_client_ = std::move(session_controller_client);
119 } 122 }
120 123
121 void reset_commandline() { command_line_.reset(); } 124 void reset_commandline() { command_line_.reset(); }
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 176
174 std::unique_ptr<base::test::ScopedCommandLine> command_line_; 177 std::unique_ptr<base::test::ScopedCommandLine> command_line_;
175 178
176 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); 179 DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
177 }; 180 };
178 181
179 } // namespace test 182 } // namespace test
180 } // namespace ash 183 } // namespace ash
181 184
182 #endif // ASH_TEST_ASH_TEST_HELPER_H_ 185 #endif // ASH_TEST_ASH_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « ash/shell_port.h ('k') | ui/aura/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698