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

Side by Side Diff: ui/views/mus/window_tree_host_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/window_manager_connection.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 {
15 class Connector;
16 }
17
18 namespace mus { 14 namespace mus {
19 class Window; 15 class Window;
20 } 16 }
21 17
18 namespace shell {
19 class Connector;
20 }
21
22 namespace views { 22 namespace views {
23 23
24 class InputMethodMUS; 24 class InputMethodMUS;
25 class NativeWidgetMus; 25 class NativeWidgetMus;
26 class PlatformWindowMus; 26 class PlatformWindowMus;
27 27
28 class VIEWS_MUS_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform { 28 class VIEWS_MUS_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform {
29 public: 29 public:
30 WindowTreeHostMus(mojo::Connector* connector, 30 WindowTreeHostMus(shell::Connector* connector,
31 NativeWidgetMus* native_widget, 31 NativeWidgetMus* native_widget,
32 mus::Window* window); 32 mus::Window* window);
33 ~WindowTreeHostMus() override; 33 ~WindowTreeHostMus() override;
34 34
35 PlatformWindowMus* platform_window(); 35 PlatformWindowMus* platform_window();
36 ui::PlatformWindowState show_state() const { return show_state_; } 36 ui::PlatformWindowState show_state() const { return show_state_; }
37 37
38 private: 38 private:
39 // aura::WindowTreeHostPlatform: 39 // aura::WindowTreeHostPlatform:
40 void DispatchEvent(ui::Event* event) override; 40 void DispatchEvent(ui::Event* event) override;
41 void OnClosed() override; 41 void OnClosed() override;
42 void OnWindowStateChanged(ui::PlatformWindowState new_state) override; 42 void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
43 void OnActivationChanged(bool active) override; 43 void OnActivationChanged(bool active) override;
44 void OnCloseRequest() override; 44 void OnCloseRequest() override;
45 45
46 NativeWidgetMus* native_widget_; 46 NativeWidgetMus* native_widget_;
47 std::unique_ptr<InputMethodMUS> input_method_; 47 std::unique_ptr<InputMethodMUS> input_method_;
48 ui::PlatformWindowState show_state_; 48 ui::PlatformWindowState show_state_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); 50 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
51 }; 51 };
52 52
53 } // namespace views 53 } // namespace views
54 54
55 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ 55 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
OLDNEW
« no previous file with comments | « ui/views/mus/window_manager_connection.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