Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(465)

Side by Side Diff: ui/views/mus/platform_window_mus.h

Issue 1634103002: views/mus: Make PlatformWindowMus be responsible for setting-up the BitmapUploader. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ui/views/mus/platform_window_mus.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "components/mus/public/cpp/input_event_handler.h" 14 #include "components/mus/public/cpp/input_event_handler.h"
15 #include "components/mus/public/cpp/window_observer.h" 15 #include "components/mus/public/cpp/window_observer.h"
16 #include "ui/platform_window/platform_window.h" 16 #include "ui/platform_window/platform_window.h"
17 #include "ui/views/mus/mus_export.h" 17 #include "ui/views/mus/mus_export.h"
18 18
19 namespace bitmap_uploader {
20 class BitmapUploader;
21 }
22
23 namespace mojo {
24 class Shell;
25 }
26
27 namespace ui {
28 class ViewProp;
29 }
30
19 namespace views { 31 namespace views {
20 32
21 class VIEWS_MUS_EXPORT PlatformWindowMus 33 class VIEWS_MUS_EXPORT PlatformWindowMus
22 : public NON_EXPORTED_BASE(ui::PlatformWindow), 34 : public NON_EXPORTED_BASE(ui::PlatformWindow),
23 public mus::WindowObserver, 35 public mus::WindowObserver,
24 public NON_EXPORTED_BASE(mus::InputEventHandler) { 36 public NON_EXPORTED_BASE(mus::InputEventHandler) {
25 public: 37 public:
26 PlatformWindowMus(ui::PlatformWindowDelegate* delegate, 38 PlatformWindowMus(ui::PlatformWindowDelegate* delegate,
39 mojo::Shell* shell,
27 mus::Window* mus_window); 40 mus::Window* mus_window);
28 ~PlatformWindowMus() override; 41 ~PlatformWindowMus() override;
29 42
30 void Activate(); 43 void Activate();
31 44
32 void SetCursorById(mus::mojom::Cursor cursor); 45 void SetCursorById(mus::mojom::Cursor cursor);
33 46
34 // ui::PlatformWindow: 47 // ui::PlatformWindow:
35 void Show() override; 48 void Show() override;
36 void Hide() override; 49 void Hide() override;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 88
76 ui::PlatformWindowDelegate* delegate_; 89 ui::PlatformWindowDelegate* delegate_;
77 mus::Window* mus_window_; 90 mus::Window* mus_window_;
78 mus::mojom::ShowState show_state_; 91 mus::mojom::ShowState show_state_;
79 mus::mojom::Cursor last_cursor_; 92 mus::mojom::Cursor last_cursor_;
80 bool has_capture_; 93 bool has_capture_;
81 94
82 // True if OnWindowDestroyed() has been received. 95 // True if OnWindowDestroyed() has been received.
83 bool mus_window_destroyed_; 96 bool mus_window_destroyed_;
84 97
98 scoped_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_;
99 scoped_ptr<ui::ViewProp> prop_;
85 #ifndef NDEBUG 100 #ifndef NDEBUG
86 scoped_ptr<base::WeakPtrFactory<PlatformWindowMus>> weak_factory_; 101 scoped_ptr<base::WeakPtrFactory<PlatformWindowMus>> weak_factory_;
87 #endif 102 #endif
88 103
89 DISALLOW_COPY_AND_ASSIGN(PlatformWindowMus); 104 DISALLOW_COPY_AND_ASSIGN(PlatformWindowMus);
90 }; 105 };
91 106
92 } // namespace views 107 } // namespace views
93 108
94 #endif // UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_ 109 #endif // UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/mus/platform_window_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698