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

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

Issue 1679573002: Move shell interfaces into the shell.mojom namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@delegate
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 | « ui/views/mus/surface_context_factory.cc ('k') | ui/views/mus/window_tree_host_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_WINDOW_TREE_HOST_MUS_H_ 5 #ifndef UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
6 #define UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ 6 #define UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/aura/window_tree_host_platform.h" 9 #include "ui/aura/window_tree_host_platform.h"
10 #include "ui/views/mus/mus_export.h" 10 #include "ui/views/mus/mus_export.h"
11 11
12 class SkBitmap; 12 class SkBitmap;
13 13
14 namespace mojo { 14 namespace mojo {
15 namespace shell {
16 namespace mojom {
15 class Shell; 17 class Shell;
16 } 18 }
19 }
20 }
17 21
18 namespace mus { 22 namespace mus {
19 class Window; 23 class Window;
20 } 24 }
21 25
22 namespace views { 26 namespace views {
23 27
24 class InputMethodMUS; 28 class InputMethodMUS;
25 class NativeWidgetMus; 29 class NativeWidgetMus;
26 class PlatformWindowMus; 30 class PlatformWindowMus;
27 31
28 class VIEWS_MUS_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform { 32 class VIEWS_MUS_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform {
29 public: 33 public:
30 WindowTreeHostMus(mojo::Shell* shell, 34 WindowTreeHostMus(mojo::shell::mojom::Shell* shell,
31 NativeWidgetMus* native_widget_, 35 NativeWidgetMus* native_widget_,
32 mus::Window* window); 36 mus::Window* window);
33 ~WindowTreeHostMus() override; 37 ~WindowTreeHostMus() override;
34 38
35 PlatformWindowMus* platform_window(); 39 PlatformWindowMus* platform_window();
36 ui::PlatformWindowState show_state() const { return show_state_; } 40 ui::PlatformWindowState show_state() const { return show_state_; }
37 41
38 private: 42 private:
39 // aura::WindowTreeHostPlatform: 43 // aura::WindowTreeHostPlatform:
40 void DispatchEvent(ui::Event* event) override; 44 void DispatchEvent(ui::Event* event) override;
41 void OnClosed() override; 45 void OnClosed() override;
42 void OnWindowStateChanged(ui::PlatformWindowState new_state) override; 46 void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
43 void OnActivationChanged(bool active) override; 47 void OnActivationChanged(bool active) override;
44 void OnCloseRequest() override; 48 void OnCloseRequest() override;
45 49
46 NativeWidgetMus* native_widget_; 50 NativeWidgetMus* native_widget_;
47 scoped_ptr<InputMethodMUS> input_method_; 51 scoped_ptr<InputMethodMUS> input_method_;
48 ui::PlatformWindowState show_state_; 52 ui::PlatformWindowState show_state_;
49 53
50 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); 54 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
51 }; 55 };
52 56
53 } // namespace views 57 } // namespace views
54 58
55 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ 59 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
OLDNEW
« no previous file with comments | « ui/views/mus/surface_context_factory.cc ('k') | ui/views/mus/window_tree_host_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698