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

Side by Side Diff: ui/aura/test/aura_test_helper.cc

Issue 2470963002: Makes it possible for clients to directly create WindowTreeHostMus (Closed)
Patch Set: nuke comment Created 4 years, 1 month 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 | « ui/aura/test/aura_test_base.cc ('k') | ui/aura/window.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 "ui/aura/test/aura_test_helper.h" 5 #include "ui/aura/test/aura_test_helper.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "ui/aura/client/default_capture_client.h" 10 #include "ui/aura/client/default_capture_client.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 Env::WindowPortFactory AuraTestHelper::InitMus() { 163 Env::WindowPortFactory AuraTestHelper::InitMus() {
164 window_tree_client_setup_ = base::MakeUnique<TestWindowTreeClientSetup>(); 164 window_tree_client_setup_ = base::MakeUnique<TestWindowTreeClientSetup>();
165 window_tree_client_setup_->InitForWindowManager(window_tree_delegate_, 165 window_tree_client_setup_->InitForWindowManager(window_tree_delegate_,
166 window_manager_delegate_); 166 window_manager_delegate_);
167 return base::Bind(&AuraTestHelper::CreateWindowPortMus, 167 return base::Bind(&AuraTestHelper::CreateWindowPortMus,
168 base::Unretained(this)); 168 base::Unretained(this));
169 } 169 }
170 170
171 std::unique_ptr<WindowPort> AuraTestHelper::CreateWindowPortMus( 171 std::unique_ptr<WindowPort> AuraTestHelper::CreateWindowPortMus(
172 Window* window) { 172 Window* window) {
173 return base::MakeUnique<WindowPortMus>(window_tree_client()); 173 return base::MakeUnique<WindowPortMus>(window_tree_client(),
174 WindowMusType::LOCAL);
174 } 175 }
175 176
176 } // namespace test 177 } // namespace test
177 } // namespace aura 178 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/test/aura_test_base.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698