OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/shell/browser/shell_platform_data_aura.h" | 5 #include "content/shell/browser/shell_platform_data_aura.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "content/shell/browser/shell.h" | 8 #include "content/shell/browser/shell.h" |
9 #include "ui/aura/client/default_capture_client.h" | 9 #include "ui/aura/client/default_capture_client.h" |
10 #include "ui/aura/env.h" | 10 #include "ui/aura/env.h" |
11 #include "ui/aura/layout_manager.h" | 11 #include "ui/aura/layout_manager.h" |
12 #include "ui/aura/test/test_focus_client.h" | 12 #include "ui/aura/test/test_focus_client.h" |
13 #include "ui/aura/test/test_window_tree_client.h" | 13 #include "ui/aura/test/test_window_parenting_client.h" |
14 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
15 #include "ui/aura/window_event_dispatcher.h" | 15 #include "ui/aura/window_event_dispatcher.h" |
16 #include "ui/base/ime/input_method.h" | 16 #include "ui/base/ime/input_method.h" |
17 #include "ui/base/ime/input_method_delegate.h" | 17 #include "ui/base/ime/input_method_delegate.h" |
18 #include "ui/base/ime/input_method_factory.h" | 18 #include "ui/base/ime/input_method_factory.h" |
19 #include "ui/wm/core/default_activation_client.h" | 19 #include "ui/wm/core/default_activation_client.h" |
20 | 20 |
21 namespace content { | 21 namespace content { |
22 | 22 |
23 namespace { | 23 namespace { |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 host_.reset(aura::WindowTreeHost::Create(gfx::Rect(initial_size))); | 64 host_.reset(aura::WindowTreeHost::Create(gfx::Rect(initial_size))); |
65 host_->InitHost(); | 65 host_->InitHost(); |
66 host_->window()->SetLayoutManager(new FillLayout(host_->window())); | 66 host_->window()->SetLayoutManager(new FillLayout(host_->window())); |
67 | 67 |
68 focus_client_.reset(new aura::test::TestFocusClient()); | 68 focus_client_.reset(new aura::test::TestFocusClient()); |
69 aura::client::SetFocusClient(host_->window(), focus_client_.get()); | 69 aura::client::SetFocusClient(host_->window(), focus_client_.get()); |
70 | 70 |
71 new wm::DefaultActivationClient(host_->window()); | 71 new wm::DefaultActivationClient(host_->window()); |
72 capture_client_.reset( | 72 capture_client_.reset( |
73 new aura::client::DefaultCaptureClient(host_->window())); | 73 new aura::client::DefaultCaptureClient(host_->window())); |
74 window_tree_client_.reset( | 74 window_parenting_client_.reset( |
75 new aura::test::TestWindowTreeClient(host_->window())); | 75 new aura::test::TestWindowParentingClient(host_->window())); |
76 } | 76 } |
77 | 77 |
78 ShellPlatformDataAura::~ShellPlatformDataAura() { | 78 ShellPlatformDataAura::~ShellPlatformDataAura() { |
79 } | 79 } |
80 | 80 |
81 void ShellPlatformDataAura::ShowWindow() { | 81 void ShellPlatformDataAura::ShowWindow() { |
82 host_->Show(); | 82 host_->Show(); |
83 } | 83 } |
84 | 84 |
85 void ShellPlatformDataAura::ResizeWindow(const gfx::Size& size) { | 85 void ShellPlatformDataAura::ResizeWindow(const gfx::Size& size) { |
86 host_->SetBounds(gfx::Rect(size)); | 86 host_->SetBounds(gfx::Rect(size)); |
87 } | 87 } |
88 | 88 |
89 } // namespace content | 89 } // namespace content |
OLD | NEW |