| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/mus/test_window_tree_client_setup.h" | 5 #include "ui/aura/test/mus/test_window_tree_client_setup.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "ui/aura/mus/window_tree_client.h" | 8 #include "ui/aura/mus/window_tree_client.h" |
| 9 #include "ui/aura/test/mus/test_window_tree.h" | 9 #include "ui/aura/test/mus/test_window_tree.h" |
| 10 #include "ui/aura/test/mus/window_tree_client_private.h" | 10 #include "ui/aura/test/mus/window_tree_client_private.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 | 39 |
| 40 WindowTreeClient* TestWindowTreeClientSetup::window_tree_client() { | 40 WindowTreeClient* TestWindowTreeClientSetup::window_tree_client() { |
| 41 return window_tree_client_.get(); | 41 return window_tree_client_.get(); |
| 42 } | 42 } |
| 43 | 43 |
| 44 void TestWindowTreeClientSetup::CommonInit( | 44 void TestWindowTreeClientSetup::CommonInit( |
| 45 WindowTreeClientDelegate* window_tree_delegate, | 45 WindowTreeClientDelegate* window_tree_delegate, |
| 46 WindowManagerDelegate* window_manager_delegate) { | 46 WindowManagerDelegate* window_manager_delegate) { |
| 47 window_tree_.reset(new TestWindowTree); | 47 window_tree_.reset(new TestWindowTree); |
| 48 window_tree_client_ = base::MakeUnique<WindowTreeClient>( | 48 window_tree_client_ = base::MakeUnique<WindowTreeClient>( |
| 49 window_tree_delegate, window_manager_delegate, nullptr); | 49 nullptr, window_tree_delegate, window_manager_delegate); |
| 50 window_tree_->set_client(window_tree_client_.get()); | 50 window_tree_->set_client(window_tree_client_.get()); |
| 51 } | 51 } |
| 52 | 52 |
| 53 } // namespace aura | 53 } // namespace aura |
| OLD | NEW |