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

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

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 | « ui/views/mus/platform_test_helper_mus.cc ('k') | 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 { 19 namespace bitmap_uploader {
20 class BitmapUploader; 20 class BitmapUploader;
21 } 21 }
22 22
23 namespace mojo { 23 namespace shell {
24 class Connector; 24 class Connector;
25 } 25 }
26 26
27 namespace ui { 27 namespace ui {
28 class Event; 28 class Event;
29 class ViewProp; 29 class ViewProp;
30 } 30 }
31 31
32 namespace views { 32 namespace views {
33 33
34 class VIEWS_MUS_EXPORT PlatformWindowMus 34 class VIEWS_MUS_EXPORT PlatformWindowMus
35 : public NON_EXPORTED_BASE(ui::PlatformWindow), 35 : public NON_EXPORTED_BASE(ui::PlatformWindow),
36 public mus::WindowObserver, 36 public mus::WindowObserver,
37 public NON_EXPORTED_BASE(mus::InputEventHandler) { 37 public NON_EXPORTED_BASE(mus::InputEventHandler) {
38 public: 38 public:
39 PlatformWindowMus(ui::PlatformWindowDelegate* delegate, 39 PlatformWindowMus(ui::PlatformWindowDelegate* delegate,
40 mojo::Connector* connector, 40 shell::Connector* connector,
41 mus::Window* mus_window); 41 mus::Window* mus_window);
42 ~PlatformWindowMus() override; 42 ~PlatformWindowMus() override;
43 43
44 void Activate(); 44 void Activate();
45 45
46 void SetCursorById(mus::mojom::Cursor cursor); 46 void SetCursorById(mus::mojom::Cursor cursor);
47 47
48 // ui::PlatformWindow: 48 // ui::PlatformWindow:
49 void Show() override; 49 void Show() override;
50 void Hide() override; 50 void Hide() override;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 #ifndef NDEBUG 101 #ifndef NDEBUG
102 std::unique_ptr<base::WeakPtrFactory<PlatformWindowMus>> weak_factory_; 102 std::unique_ptr<base::WeakPtrFactory<PlatformWindowMus>> weak_factory_;
103 #endif 103 #endif
104 104
105 DISALLOW_COPY_AND_ASSIGN(PlatformWindowMus); 105 DISALLOW_COPY_AND_ASSIGN(PlatformWindowMus);
106 }; 106 };
107 107
108 } // namespace views 108 } // namespace views
109 109
110 #endif // UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_ 110 #endif // UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_
OLDNEW
« no previous file with comments | « ui/views/mus/platform_test_helper_mus.cc ('k') | ui/views/mus/platform_window_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698