| 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_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 5 #ifndef UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| 6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_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 "base/observer_list.h" | 16 #include "base/observer_list.h" |
| 17 #include "services/shell/public/cpp/identity.h" | 17 #include "services/shell/public/cpp/identity.h" |
| 18 #include "services/ui/public/cpp/window_tree_client_delegate.h" | 18 #include "services/ui/public/cpp/window_tree_client_delegate.h" |
| 19 #include "ui/views/mus/mus_export.h" | 19 #include "ui/views/mus/mus_export.h" |
| 20 #include "ui/views/mus/screen_mus_delegate.h" | 20 #include "ui/views/mus/screen_mus_delegate.h" |
| 21 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
| 22 | 22 |
| 23 namespace shell { | 23 namespace shell { |
| 24 class Connector; | 24 class Connector; |
| 25 } | 25 } |
| 26 | 26 |
| 27 namespace views { | 27 namespace views { |
| 28 class ClipboardMus; | 28 class ClipboardMus; |
| 29 class NativeWidget; | 29 class NativeWidget; |
| 30 class PointerWatcher; | 30 class PointerDownWatcher; |
| 31 class TouchEventWatcher; | 31 class TouchEventWatcher; |
| 32 class ScreenMus; | 32 class ScreenMus; |
| 33 namespace internal { | 33 namespace internal { |
| 34 class NativeWidgetDelegate; | 34 class NativeWidgetDelegate; |
| 35 } | 35 } |
| 36 | 36 |
| 37 // Provides configuration to mus in views. This consists of the following: | 37 // Provides configuration to mus in views. This consists of the following: |
| 38 // . Provides a Screen implementation backed by mus. | 38 // . Provides a Screen implementation backed by mus. |
| 39 // . Provides a Clipboard implementation backed by mus. | 39 // . Provides a Clipboard implementation backed by mus. |
| 40 // . Creates and owns a WindowTreeClient. | 40 // . Creates and owns a WindowTreeClient. |
| (...skipping 17 matching lines...) Expand all Loading... |
| 58 shell::Connector* connector() { return connector_; } | 58 shell::Connector* connector() { return connector_; } |
| 59 | 59 |
| 60 ui::Window* NewWindow( | 60 ui::Window* NewWindow( |
| 61 const std::map<std::string, std::vector<uint8_t>>& properties); | 61 const std::map<std::string, std::vector<uint8_t>>& properties); |
| 62 | 62 |
| 63 NativeWidget* CreateNativeWidgetMus( | 63 NativeWidget* CreateNativeWidgetMus( |
| 64 const std::map<std::string, std::vector<uint8_t>>& properties, | 64 const std::map<std::string, std::vector<uint8_t>>& properties, |
| 65 const Widget::InitParams& init_params, | 65 const Widget::InitParams& init_params, |
| 66 internal::NativeWidgetDelegate* delegate); | 66 internal::NativeWidgetDelegate* delegate); |
| 67 | 67 |
| 68 void AddPointerWatcher(PointerWatcher* watcher); | 68 void AddPointerDownWatcher(PointerDownWatcher* watcher); |
| 69 void RemovePointerWatcher(PointerWatcher* watcher); | 69 void RemovePointerDownWatcher(PointerDownWatcher* watcher); |
| 70 | 70 |
| 71 void AddTouchEventWatcher(TouchEventWatcher* watcher); | 71 void AddTouchEventWatcher(TouchEventWatcher* watcher); |
| 72 void RemoveTouchEventWatcher(TouchEventWatcher* watcher); | 72 void RemoveTouchEventWatcher(TouchEventWatcher* watcher); |
| 73 | 73 |
| 74 const std::set<ui::Window*>& GetRoots() const; | 74 const std::set<ui::Window*>& GetRoots() const; |
| 75 | 75 |
| 76 private: | 76 private: |
| 77 friend class WindowManagerConnectionTest; | 77 friend class WindowManagerConnectionTest; |
| 78 | 78 |
| 79 WindowManagerConnection(shell::Connector* connector, | 79 WindowManagerConnection(shell::Connector* connector, |
| 80 const shell::Identity& identity); | 80 const shell::Identity& identity); |
| 81 | 81 |
| 82 // Returns true if there is one or more watchers for this client. | 82 // Returns true if there is one or more watchers for this client. |
| 83 bool HasPointerWatcher(); | 83 bool HasPointerDownWatcher(); |
| 84 bool HasTouchEventWatcher(); | 84 bool HasTouchEventWatcher(); |
| 85 | 85 |
| 86 // ui::WindowTreeClientDelegate: | 86 // ui::WindowTreeClientDelegate: |
| 87 void OnEmbed(ui::Window* root) override; | 87 void OnEmbed(ui::Window* root) override; |
| 88 void OnDidDestroyClient(ui::WindowTreeClient* client) override; | 88 void OnDidDestroyClient(ui::WindowTreeClient* client) override; |
| 89 void OnEventObserved(const ui::Event& event, ui::Window* target) override; | 89 void OnEventObserved(const ui::Event& event, ui::Window* target) override; |
| 90 | 90 |
| 91 // ScreenMusDelegate: | 91 // ScreenMusDelegate: |
| 92 void OnWindowManagerFrameValuesChanged() override; | 92 void OnWindowManagerFrameValuesChanged() override; |
| 93 gfx::Point GetCursorScreenPoint() override; | 93 gfx::Point GetCursorScreenPoint() override; |
| 94 | 94 |
| 95 shell::Connector* connector_; | 95 shell::Connector* connector_; |
| 96 shell::Identity identity_; | 96 shell::Identity identity_; |
| 97 std::unique_ptr<ScreenMus> screen_; | 97 std::unique_ptr<ScreenMus> screen_; |
| 98 std::unique_ptr<ui::WindowTreeClient> client_; | 98 std::unique_ptr<ui::WindowTreeClient> client_; |
| 99 // Must be empty on destruction. | 99 // Must be empty on destruction. |
| 100 base::ObserverList<PointerWatcher, true> pointer_watchers_; | 100 base::ObserverList<PointerDownWatcher, true> pointer_down_watchers_; |
| 101 base::ObserverList<TouchEventWatcher, true> touch_event_watchers_; | 101 base::ObserverList<TouchEventWatcher, true> touch_event_watchers_; |
| 102 | 102 |
| 103 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 103 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
| 104 }; | 104 }; |
| 105 | 105 |
| 106 } // namespace views | 106 } // namespace views |
| 107 | 107 |
| 108 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 108 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| OLD | NEW |