| 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 "ash/host/ash_window_tree_host_init_params.h" | 7 #include "ash/host/ash_window_tree_host_init_params.h" |
| 8 #include "ash/host/ash_window_tree_host_virtual.h" |
| 8 #include "ash/host/root_window_transformer.h" | 9 #include "ash/host/root_window_transformer.h" |
| 9 #include "ash/host/transformer_helper.h" | 10 #include "ash/host/transformer_helper.h" |
| 10 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 11 #include "base/trace_event/trace_event.h" | 12 #include "base/trace_event/trace_event.h" |
| 12 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
| 13 #include "ui/aura/window_tree_host_ozone.h" | 14 #include "ui/aura/window_tree_host_ozone.h" |
| 14 #include "ui/events/null_event_targeter.h" | 15 #include "ui/events/null_event_targeter.h" |
| 15 #include "ui/gfx/geometry/insets.h" | 16 #include "ui/gfx/geometry/insets.h" |
| 16 #include "ui/gfx/transform.h" | 17 #include "ui/gfx/transform.h" |
| 17 #include "ui/ozone/public/input_controller.h" | 18 #include "ui/ozone/public/input_controller.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 // Temporarily pause tap-to-click when the cursor is hidden. | 138 // Temporarily pause tap-to-click when the cursor is hidden. |
| 138 ui::OzonePlatform::GetInstance()->GetInputController()->SetTapToClickPaused( | 139 ui::OzonePlatform::GetInstance()->GetInputController()->SetTapToClickPaused( |
| 139 state); | 140 state); |
| 140 #endif | 141 #endif |
| 141 } | 142 } |
| 142 | 143 |
| 143 } // namespace | 144 } // namespace |
| 144 | 145 |
| 145 AshWindowTreeHost* AshWindowTreeHost::Create( | 146 AshWindowTreeHost* AshWindowTreeHost::Create( |
| 146 const AshWindowTreeHostInitParams& init_params) { | 147 const AshWindowTreeHostInitParams& init_params) { |
| 148 if (init_params.offscreen) |
| 149 return new AshWindowTreeHostVirtual(init_params.initial_bounds); |
| 147 return new AshWindowTreeHostOzone(init_params.initial_bounds); | 150 return new AshWindowTreeHostOzone(init_params.initial_bounds); |
| 148 } | 151 } |
| 149 | 152 |
| 150 } // namespace ash | 153 } // namespace ash |
| OLD | NEW |