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

Side by Side Diff: ui/views/mus/native_widget_mus.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 | « no previous file | ui/views/mus/native_widget_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_NATIVE_WIDGET_MUS_H_ 5 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "components/mus/public/interfaces/window_manager.mojom.h" 9 #include "components/mus/public/interfaces/window_manager.mojom.h"
10 #include "ui/aura/window_delegate.h" 10 #include "ui/aura/window_delegate.h"
(...skipping 12 matching lines...) Expand all
23 23
24 namespace mus { 24 namespace mus {
25 class Window; 25 class Window;
26 } 26 }
27 27
28 namespace wm { 28 namespace wm {
29 class FocusController; 29 class FocusController;
30 } 30 }
31 31
32 namespace views { 32 namespace views {
33 class WindowTreeHostMojo; 33 class WindowTreeHostMus;
34 34
35 // An implementation of NativeWidget that binds to a mus::Window. Because Aura 35 // An implementation of NativeWidget that binds to a mus::Window. Because Aura
36 // is used extensively within Views code, this code uses aura and binds to the 36 // is used extensively within Views code, this code uses aura and binds to the
37 // mus::Window via a Mus-specific aura::WindowTreeHost impl. Because the root 37 // mus::Window via a Mus-specific aura::WindowTreeHost impl. Because the root
38 // aura::Window in a hierarchy is created without a delegate by the 38 // aura::Window in a hierarchy is created without a delegate by the
39 // aura::WindowTreeHost, we must create a child aura::Window in this class 39 // aura::WindowTreeHost, we must create a child aura::Window in this class
40 // (content_) and attach it to the root. 40 // (content_) and attach it to the root.
41 class NativeWidgetMus : public internal::NativeWidgetPrivate, 41 class NativeWidgetMus : public internal::NativeWidgetPrivate,
42 public aura::WindowDelegate { 42 public aura::WindowDelegate {
43 public: 43 public:
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 mus::Window* window_; 164 mus::Window* window_;
165 165
166 mojo::Shell* shell_; 166 mojo::Shell* shell_;
167 167
168 internal::NativeWidgetDelegate* native_widget_delegate_; 168 internal::NativeWidgetDelegate* native_widget_delegate_;
169 169
170 mus::mojom::ShowState show_state_before_fullscreen_; 170 mus::mojom::ShowState show_state_before_fullscreen_;
171 171
172 // Aura configuration. 172 // Aura configuration.
173 scoped_ptr<WindowTreeHostMojo> window_tree_host_; 173 scoped_ptr<WindowTreeHostMus> window_tree_host_;
174 aura::Window* content_; 174 aura::Window* content_;
175 scoped_ptr<wm::FocusController> focus_client_; 175 scoped_ptr<wm::FocusController> focus_client_;
176 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 176 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
177 177
178 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); 178 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
179 }; 179 };
180 180
181 } // namespace views 181 } // namespace views
182 182
183 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 183 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/mus/native_widget_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698