| 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_PLATFORM_WINDOW_MUS_H_ | 5 #ifndef UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_ |
| 6 #define UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_ | 6 #define UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 mus::Window* window, | 79 mus::Window* window, |
| 80 const std::string& name, | 80 const std::string& name, |
| 81 const std::vector<uint8_t>* old_data, | 81 const std::vector<uint8_t>* old_data, |
| 82 const std::vector<uint8_t>* new_data) override; | 82 const std::vector<uint8_t>* new_data) override; |
| 83 void OnRequestClose(mus::Window* window) override; | 83 void OnRequestClose(mus::Window* window) override; |
| 84 | 84 |
| 85 // mus::InputEventHandler: | 85 // mus::InputEventHandler: |
| 86 void OnWindowInputEvent( | 86 void OnWindowInputEvent( |
| 87 mus::Window* view, | 87 mus::Window* view, |
| 88 const ui::Event& event, | 88 const ui::Event& event, |
| 89 std::unique_ptr<base::Callback<void(bool)>>* ack_callback) override; | 89 std::unique_ptr<base::Callback<void(mus::mojom::EventResult)>>* |
| 90 ack_callback) override; |
| 90 | 91 |
| 91 ui::PlatformWindowDelegate* delegate_; | 92 ui::PlatformWindowDelegate* delegate_; |
| 92 mus::Window* mus_window_; | 93 mus::Window* mus_window_; |
| 93 mus::mojom::ShowState show_state_; | 94 mus::mojom::ShowState show_state_; |
| 94 mus::mojom::Cursor last_cursor_; | 95 mus::mojom::Cursor last_cursor_; |
| 95 | 96 |
| 96 // True if OnWindowDestroyed() has been received. | 97 // True if OnWindowDestroyed() has been received. |
| 97 bool mus_window_destroyed_; | 98 bool mus_window_destroyed_; |
| 98 | 99 |
| 99 std::unique_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_; | 100 std::unique_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_; |
| 100 std::unique_ptr<ui::ViewProp> prop_; | 101 std::unique_ptr<ui::ViewProp> prop_; |
| 101 #ifndef NDEBUG | 102 #ifndef NDEBUG |
| 102 std::unique_ptr<base::WeakPtrFactory<PlatformWindowMus>> weak_factory_; | 103 std::unique_ptr<base::WeakPtrFactory<PlatformWindowMus>> weak_factory_; |
| 103 #endif | 104 #endif |
| 104 | 105 |
| 105 DISALLOW_COPY_AND_ASSIGN(PlatformWindowMus); | 106 DISALLOW_COPY_AND_ASSIGN(PlatformWindowMus); |
| 106 }; | 107 }; |
| 107 | 108 |
| 108 } // namespace views | 109 } // namespace views |
| 109 | 110 |
| 110 #endif // UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_ | 111 #endif // UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_ |
| OLD | NEW |