| 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 #ifndef MANDOLINE_UI_AURA_WINDOW_TREE_HOST_MOJO_H_ | 5 #ifndef MANDOLINE_UI_AURA_WINDOW_TREE_HOST_MOJO_H_ |
| 6 #define MANDOLINE_UI_AURA_WINDOW_TREE_HOST_MOJO_H_ | 6 #define MANDOLINE_UI_AURA_WINDOW_TREE_HOST_MOJO_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "components/view_manager/public/cpp/view_observer.h" | 9 #include "components/mus/public/cpp/view_observer.h" |
| 10 #include "ui/aura/window_tree_host.h" | 10 #include "ui/aura/window_tree_host.h" |
| 11 #include "ui/events/event_source.h" | 11 #include "ui/events/event_source.h" |
| 12 #include "ui/gfx/geometry/rect.h" | 12 #include "ui/gfx/geometry/rect.h" |
| 13 | 13 |
| 14 class SkBitmap; | 14 class SkBitmap; |
| 15 | 15 |
| 16 namespace ui { | 16 namespace ui { |
| 17 class Compositor; | 17 class Compositor; |
| 18 } | 18 } |
| 19 | 19 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 scoped_ptr<InputMethodMandoline> input_method_; | 65 scoped_ptr<InputMethodMandoline> input_method_; |
| 66 | 66 |
| 67 scoped_ptr<SurfaceContextFactory> context_factory_; | 67 scoped_ptr<SurfaceContextFactory> context_factory_; |
| 68 | 68 |
| 69 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMojo); | 69 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMojo); |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 } // namespace mandoline | 72 } // namespace mandoline |
| 73 | 73 |
| 74 #endif // MANDOLINE_UI_AURA_WINDOW_TREE_HOST_MOJO_H_ | 74 #endif // MANDOLINE_UI_AURA_WINDOW_TREE_HOST_MOJO_H_ |
| OLD | NEW |