| 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 UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ | 5 #ifndef UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ |
| 6 #define UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ | 6 #define UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| 11 #include <memory> | 11 #include <memory> |
| 12 #include <string> | 12 #include <string> |
| 13 #include <vector> | 13 #include <vector> |
| 14 | 14 |
| 15 #include "base/macros.h" | 15 #include "base/macros.h" |
| 16 #include "cc/surfaces/local_frame_id.h" |
| 16 #include "services/service_manager/public/cpp/connector.h" | 17 #include "services/service_manager/public/cpp/connector.h" |
| 17 #include "ui/aura/aura_export.h" | 18 #include "ui/aura/aura_export.h" |
| 18 #include "ui/aura/window_tree_host_platform.h" | 19 #include "ui/aura/window_tree_host_platform.h" |
| 19 | 20 |
| 20 namespace display { | 21 namespace display { |
| 21 class Display; | 22 class Display; |
| 22 } | 23 } |
| 23 | 24 |
| 24 namespace aura { | 25 namespace aura { |
| 25 | 26 |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 bool in_set_bounds_from_server_ = false; | 102 bool in_set_bounds_from_server_ = false; |
| 102 | 103 |
| 103 std::unique_ptr<InputMethodMus> input_method_; | 104 std::unique_ptr<InputMethodMus> input_method_; |
| 104 | 105 |
| 105 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); | 106 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); |
| 106 }; | 107 }; |
| 107 | 108 |
| 108 } // namespace aura | 109 } // namespace aura |
| 109 | 110 |
| 110 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ | 111 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ |
| OLD | NEW |