| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_unified.h" | 5 #include "ash/host/ash_window_tree_host_unified.h" |
| 6 |
| 7 #include <utility> |
| 8 |
| 6 #include "ash/host/root_window_transformer.h" | 9 #include "ash/host/root_window_transformer.h" |
| 7 #include "ash/ime/input_method_event_handler.h" | 10 #include "ash/ime/input_method_event_handler.h" |
| 8 #include "base/logging.h" | 11 #include "base/logging.h" |
| 9 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 10 #include "ui/aura/window_event_dispatcher.h" | 13 #include "ui/aura/window_event_dispatcher.h" |
| 11 #include "ui/aura/window_targeter.h" | 14 #include "ui/aura/window_targeter.h" |
| 12 #include "ui/compositor/compositor.h" | 15 #include "ui/compositor/compositor.h" |
| 13 #include "ui/events/event_processor.h" | 16 #include "ui/events/event_processor.h" |
| 14 #include "ui/events/null_event_targeter.h" | 17 #include "ui/events/null_event_targeter.h" |
| 15 #include "ui/gfx/geometry/insets.h" | 18 #include "ui/gfx/geometry/insets.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 87 |
| 85 bool AshWindowTreeHostUnified::ConfineCursorToRootWindow() { | 88 bool AshWindowTreeHostUnified::ConfineCursorToRootWindow() { |
| 86 return true; | 89 return true; |
| 87 } | 90 } |
| 88 | 91 |
| 89 void AshWindowTreeHostUnified::UnConfineCursor() { | 92 void AshWindowTreeHostUnified::UnConfineCursor() { |
| 90 } | 93 } |
| 91 | 94 |
| 92 void AshWindowTreeHostUnified::SetRootWindowTransformer( | 95 void AshWindowTreeHostUnified::SetRootWindowTransformer( |
| 93 scoped_ptr<RootWindowTransformer> transformer) { | 96 scoped_ptr<RootWindowTransformer> transformer) { |
| 94 transformer_helper_.SetRootWindowTransformer(transformer.Pass()); | 97 transformer_helper_.SetRootWindowTransformer(std::move(transformer)); |
| 95 } | 98 } |
| 96 | 99 |
| 97 gfx::Insets AshWindowTreeHostUnified::GetHostInsets() const { | 100 gfx::Insets AshWindowTreeHostUnified::GetHostInsets() const { |
| 98 return transformer_helper_.GetHostInsets(); | 101 return transformer_helper_.GetHostInsets(); |
| 99 } | 102 } |
| 100 | 103 |
| 101 aura::WindowTreeHost* AshWindowTreeHostUnified::AsWindowTreeHost() { | 104 aura::WindowTreeHost* AshWindowTreeHostUnified::AsWindowTreeHost() { |
| 102 return this; | 105 return this; |
| 103 } | 106 } |
| 104 | 107 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 ui::KeyEvent* event) { | 185 ui::KeyEvent* event) { |
| 183 input_method_handler()->SetPostIME(true); | 186 input_method_handler()->SetPostIME(true); |
| 184 ui::EventDispatchDetails details = | 187 ui::EventDispatchDetails details = |
| 185 event_processor()->OnEventFromSource(event); | 188 event_processor()->OnEventFromSource(event); |
| 186 if (!details.dispatcher_destroyed) | 189 if (!details.dispatcher_destroyed) |
| 187 input_method_handler()->SetPostIME(false); | 190 input_method_handler()->SetPostIME(false); |
| 188 return details; | 191 return details; |
| 189 } | 192 } |
| 190 | 193 |
| 191 } // namespace ash | 194 } // namespace ash |
| OLD | NEW |