| OLD | NEW |
| 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 #include "ui/wm/test/wm_test_helper.h" | 5 #include "ui/wm/test/wm_test_helper.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "ui/aura/client/default_capture_client.h" | 8 #include "ui/aura/client/default_capture_client.h" |
| 9 #include "ui/aura/env.h" | 9 #include "ui/aura/env.h" |
| 10 #include "ui/aura/test/input_method_glue.h" | 10 #include "ui/aura/test/input_method_glue.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 new wm::DefaultActivationClient(host_->window()); | 34 new wm::DefaultActivationClient(host_->window()); |
| 35 | 35 |
| 36 capture_client_.reset( | 36 capture_client_.reset( |
| 37 new aura::client::DefaultCaptureClient(host_->window())); | 37 new aura::client::DefaultCaptureClient(host_->window())); |
| 38 } | 38 } |
| 39 | 39 |
| 40 WMTestHelper::~WMTestHelper() { | 40 WMTestHelper::~WMTestHelper() { |
| 41 } | 41 } |
| 42 | 42 |
| 43 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context, | 43 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* window, |
| 44 aura::Window* window, | |
| 45 const gfx::Rect& bounds) { | 44 const gfx::Rect& bounds) { |
| 46 return host_->window(); | 45 return host_->window(); |
| 47 } | 46 } |
| 48 | 47 |
| 49 } // namespace wm | 48 } // namespace wm |
| OLD | NEW |