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_unified.h" | 8 #include "ash/host/ash_window_tree_host_unified.h" |
9 #include "ash/host/root_window_transformer.h" | 9 #include "ash/host/root_window_transformer.h" |
10 #include "ash/host/transformer_helper.h" | 10 #include "ash/host/transformer_helper.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 // Temporarily disable the tap-to-click feature. Used on CrOS. | 49 // Temporarily disable the tap-to-click feature. Used on CrOS. |
50 void SetTapToClickPaused(bool state); | 50 void SetTapToClickPaused(bool state); |
51 | 51 |
52 TransformerHelper transformer_helper_; | 52 TransformerHelper transformer_helper_; |
53 | 53 |
54 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostOzone); | 54 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostOzone); |
55 }; | 55 }; |
56 | 56 |
57 AshWindowTreeHostOzone::AshWindowTreeHostOzone(const gfx::Rect& initial_bounds) | 57 AshWindowTreeHostOzone::AshWindowTreeHostOzone(const gfx::Rect& initial_bounds) |
58 : aura::WindowTreeHostOzone(initial_bounds), transformer_helper_(this) { | 58 : aura::WindowTreeHostOzone(initial_bounds), transformer_helper_(this) { |
| 59 transformer_helper_.Init(); |
59 } | 60 } |
60 | 61 |
61 AshWindowTreeHostOzone::~AshWindowTreeHostOzone() { | 62 AshWindowTreeHostOzone::~AshWindowTreeHostOzone() { |
62 } | 63 } |
63 | 64 |
64 void AshWindowTreeHostOzone::ToggleFullScreen() { | 65 void AshWindowTreeHostOzone::ToggleFullScreen() { |
65 NOTIMPLEMENTED(); | 66 NOTIMPLEMENTED(); |
66 } | 67 } |
67 | 68 |
68 bool AshWindowTreeHostOzone::ConfineCursorToRootWindow() { | 69 bool AshWindowTreeHostOzone::ConfineCursorToRootWindow() { |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 } // namespace | 145 } // namespace |
145 | 146 |
146 AshWindowTreeHost* AshWindowTreeHost::Create( | 147 AshWindowTreeHost* AshWindowTreeHost::Create( |
147 const AshWindowTreeHostInitParams& init_params) { | 148 const AshWindowTreeHostInitParams& init_params) { |
148 if (init_params.offscreen) | 149 if (init_params.offscreen) |
149 return new AshWindowTreeHostUnified(init_params.initial_bounds); | 150 return new AshWindowTreeHostUnified(init_params.initial_bounds); |
150 return new AshWindowTreeHostOzone(init_params.initial_bounds); | 151 return new AshWindowTreeHostOzone(init_params.initial_bounds); |
151 } | 152 } |
152 | 153 |
153 } // namespace ash | 154 } // namespace ash |
OLD | NEW |