| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_VIEWS_MUS_MUS_CLIENT_H_ | 5 #ifndef UI_VIEWS_MUS_MUS_CLIENT_H_ |
| 6 #define UI_VIEWS_MUS_MUS_CLIENT_H_ | 6 #define UI_VIEWS_MUS_MUS_CLIENT_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 | 70 |
| 71 static MusClient* Get() { return instance_; } | 71 static MusClient* Get() { return instance_; } |
| 72 | 72 |
| 73 // Returns true if a DesktopNativeWidgetAura should be created given the | 73 // Returns true if a DesktopNativeWidgetAura should be created given the |
| 74 // specified params. If this returns false a NativeWidgetAura should be | 74 // specified params. If this returns false a NativeWidgetAura should be |
| 75 // created. | 75 // created. |
| 76 static bool ShouldCreateDesktopNativeWidgetAura( | 76 static bool ShouldCreateDesktopNativeWidgetAura( |
| 77 const Widget::InitParams& init_params); | 77 const Widget::InitParams& init_params); |
| 78 | 78 |
| 79 // Returns the properties to supply to mus when creating a window. | 79 // Returns the properties to supply to mus when creating a window. |
| 80 static std::map<std::string, std::vector<uint8_t>> | 80 std::map<std::string, std::vector<uint8_t>> ConfigurePropertiesFromParams( |
| 81 ConfigurePropertiesFromParams(const Widget::InitParams& init_params); | 81 const Widget::InitParams& init_params); |
| 82 | 82 |
| 83 service_manager::Connector* connector() { return connector_; } | 83 service_manager::Connector* connector() { return connector_; } |
| 84 | 84 |
| 85 aura::WindowTreeClient* window_tree_client() { | 85 aura::WindowTreeClient* window_tree_client() { |
| 86 return window_tree_client_.get(); | 86 return window_tree_client_.get(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 PointerWatcherEventRouter2* pointer_watcher_event_router() { | 89 PointerWatcherEventRouter2* pointer_watcher_event_router() { |
| 90 return pointer_watcher_event_router_.get(); | 90 return pointer_watcher_event_router_.get(); |
| 91 } | 91 } |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 std::unique_ptr<PointerWatcherEventRouter2> pointer_watcher_event_router_; | 146 std::unique_ptr<PointerWatcherEventRouter2> pointer_watcher_event_router_; |
| 147 | 147 |
| 148 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; | 148 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; |
| 149 | 149 |
| 150 DISALLOW_COPY_AND_ASSIGN(MusClient); | 150 DISALLOW_COPY_AND_ASSIGN(MusClient); |
| 151 }; | 151 }; |
| 152 | 152 |
| 153 } // namespace views | 153 } // namespace views |
| 154 | 154 |
| 155 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ | 155 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ |
| OLD | NEW |