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

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

Issue 1410193009: WindowTreeHostMojo -> WindowTreeHostMus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/native_widget_mus.cc ('k') | ui/views/mus/native_widget_view_manager.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_NATIVE_WIDGET_VIEW_MANAGER_H_ 5 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_VIEW_MANAGER_H_
6 #define UI_VIEWS_MUS_NATIVE_WIDGET_VIEW_MANAGER_H_ 6 #define UI_VIEWS_MUS_NATIVE_WIDGET_VIEW_MANAGER_H_
7 7
8 #include "ui/views/widget/native_widget_aura.h" 8 #include "ui/views/widget/native_widget_aura.h"
9 9
10 namespace aura { 10 namespace aura {
(...skipping 22 matching lines...) Expand all
33 namespace wm { 33 namespace wm {
34 class FocusController; 34 class FocusController;
35 } 35 }
36 36
37 namespace views { 37 namespace views {
38 38
39 namespace { 39 namespace {
40 class NativeWidgetWindowObserver; 40 class NativeWidgetWindowObserver;
41 } 41 }
42 42
43 class WindowTreeHostMojo; 43 class WindowTreeHostMus;
44 44
45 class NativeWidgetViewManager : public views::NativeWidgetAura { 45 class NativeWidgetViewManager : public views::NativeWidgetAura {
46 public: 46 public:
47 NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate, 47 NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate,
48 mojo::Shell* shell, 48 mojo::Shell* shell,
49 mus::Window* window); 49 mus::Window* window);
50 ~NativeWidgetViewManager() override; 50 ~NativeWidgetViewManager() override;
51 51
52 // TODO(beng): move to ctor. 52 // TODO(beng): move to ctor.
53 void set_window_manager(mus::mojom::WindowManager* window_manager) { 53 void set_window_manager(mus::mojom::WindowManager* window_manager) {
54 window_manager_ = window_manager; 54 window_manager_ = window_manager;
55 } 55 }
56 56
57 private: 57 private:
58 friend class NativeWidgetWindowObserver; 58 friend class NativeWidgetWindowObserver;
59 59
60 // Overridden from internal::NativeWidgetAura: 60 // Overridden from internal::NativeWidgetAura:
61 void InitNativeWidget(const views::Widget::InitParams& in_params) override; 61 void InitNativeWidget(const views::Widget::InitParams& in_params) override;
62 void OnWindowVisibilityChanged(aura::Window* window, bool visible) override; 62 void OnWindowVisibilityChanged(aura::Window* window, bool visible) override;
63 void CenterWindow(const gfx::Size& size) override; 63 void CenterWindow(const gfx::Size& size) override;
64 void SetBounds(const gfx::Rect& bounds) override; 64 void SetBounds(const gfx::Rect& bounds) override;
65 void SetSize(const gfx::Size& size) override; 65 void SetSize(const gfx::Size& size) override;
66 66
67 scoped_ptr<WindowTreeHostMojo> window_tree_host_; 67 scoped_ptr<WindowTreeHostMus> window_tree_host_;
68 scoped_ptr<NativeWidgetWindowObserver> window_observer_; 68 scoped_ptr<NativeWidgetWindowObserver> window_observer_;
69 69
70 scoped_ptr<wm::FocusController> focus_client_; 70 scoped_ptr<wm::FocusController> focus_client_;
71 71
72 mus::Window* window_; 72 mus::Window* window_;
73 73
74 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 74 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
75 75
76 mus::mojom::WindowManager* window_manager_; 76 mus::mojom::WindowManager* window_manager_;
77 77
78 DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager); 78 DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager);
79 }; 79 };
80 80
81 } // namespace views 81 } // namespace views
82 82
83 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_VIEW_MANAGER_H_ 83 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_VIEW_MANAGER_H_
OLDNEW
« no previous file with comments | « ui/views/mus/native_widget_mus.cc ('k') | ui/views/mus/native_widget_view_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698