| 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 "ash/host/ash_window_tree_host.h" | 5 #include "ash/host/ash_window_tree_host.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "ash/host/ash_window_tree_host_init_params.h" | 9 #include "ash/host/ash_window_tree_host_init_params.h" |
| 8 #include "ash/host/ash_window_tree_host_unified.h" | 10 #include "ash/host/ash_window_tree_host_unified.h" |
| 9 #include "ash/host/root_window_transformer.h" | 11 #include "ash/host/root_window_transformer.h" |
| 10 #include "ash/host/transformer_helper.h" | 12 #include "ash/host/transformer_helper.h" |
| 11 #include "ash/ime/input_method_event_handler.h" | 13 #include "ash/ime/input_method_event_handler.h" |
| 12 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 13 #include "base/trace_event/trace_event.h" | 15 #include "base/trace_event/trace_event.h" |
| 14 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
| 15 #include "ui/aura/window_tree_host_platform.h" | 17 #include "ui/aura/window_tree_host_platform.h" |
| 16 #include "ui/events/event_processor.h" | 18 #include "ui/events/event_processor.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 platform_window()->ConfineCursorToBounds(confined_bounds); | 80 platform_window()->ConfineCursorToBounds(confined_bounds); |
| 79 return true; | 81 return true; |
| 80 } | 82 } |
| 81 | 83 |
| 82 void AshWindowTreeHostOzone::UnConfineCursor() { | 84 void AshWindowTreeHostOzone::UnConfineCursor() { |
| 83 NOTIMPLEMENTED(); | 85 NOTIMPLEMENTED(); |
| 84 } | 86 } |
| 85 | 87 |
| 86 void AshWindowTreeHostOzone::SetRootWindowTransformer( | 88 void AshWindowTreeHostOzone::SetRootWindowTransformer( |
| 87 scoped_ptr<RootWindowTransformer> transformer) { | 89 scoped_ptr<RootWindowTransformer> transformer) { |
| 88 transformer_helper_.SetRootWindowTransformer(transformer.Pass()); | 90 transformer_helper_.SetRootWindowTransformer(std::move(transformer)); |
| 89 ConfineCursorToRootWindow(); | 91 ConfineCursorToRootWindow(); |
| 90 } | 92 } |
| 91 | 93 |
| 92 gfx::Insets AshWindowTreeHostOzone::GetHostInsets() const { | 94 gfx::Insets AshWindowTreeHostOzone::GetHostInsets() const { |
| 93 return transformer_helper_.GetHostInsets(); | 95 return transformer_helper_.GetHostInsets(); |
| 94 } | 96 } |
| 95 | 97 |
| 96 aura::WindowTreeHost* AshWindowTreeHostOzone::AsWindowTreeHost() { | 98 aura::WindowTreeHost* AshWindowTreeHostOzone::AsWindowTreeHost() { |
| 97 return this; | 99 return this; |
| 98 } | 100 } |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 } // namespace | 163 } // namespace |
| 162 | 164 |
| 163 AshWindowTreeHost* AshWindowTreeHost::Create( | 165 AshWindowTreeHost* AshWindowTreeHost::Create( |
| 164 const AshWindowTreeHostInitParams& init_params) { | 166 const AshWindowTreeHostInitParams& init_params) { |
| 165 if (init_params.offscreen) | 167 if (init_params.offscreen) |
| 166 return new AshWindowTreeHostUnified(init_params.initial_bounds); | 168 return new AshWindowTreeHostUnified(init_params.initial_bounds); |
| 167 return new AshWindowTreeHostOzone(init_params.initial_bounds); | 169 return new AshWindowTreeHostOzone(init_params.initial_bounds); |
| 168 } | 170 } |
| 169 | 171 |
| 170 } // namespace ash | 172 } // namespace ash |
| OLD | NEW |