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

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

Issue 1423133003: Routes calls to WM through WS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no braces 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
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 28 matching lines...) Expand all
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:
44 NativeWidgetMus(internal::NativeWidgetDelegate* delegate, 44 NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
45 mojo::Shell* shell, 45 mojo::Shell* shell,
46 mus::Window* window); 46 mus::Window* window);
47 ~NativeWidgetMus() override; 47 ~NativeWidgetMus() override;
48 48
49 // TODO(beng): move to ctor.
50 void set_window_manager(mus::mojom::WindowManager* window_manager) {
51 window_manager_ = window_manager;
52 }
53
54 private: 49 private:
55 void UpdateClientAreaInWindowManager(); 50 void UpdateClientAreaInWindowManager();
56 51
57 // internal::NativeWidgetPrivate: 52 // internal::NativeWidgetPrivate:
58 void InitNativeWidget(const Widget::InitParams& params) override; 53 void InitNativeWidget(const Widget::InitParams& params) override;
59 NonClientFrameView* CreateNonClientFrameView() override; 54 NonClientFrameView* CreateNonClientFrameView() override;
60 bool ShouldUseNativeFrame() const override; 55 bool ShouldUseNativeFrame() const override;
61 bool ShouldWindowContentsBeTransparent() const override; 56 bool ShouldWindowContentsBeTransparent() const override;
62 void FrameTypeChanged() override; 57 void FrameTypeChanged() override;
63 Widget* GetWidget() override; 58 Widget* GetWidget() override;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 void OnMouseEvent(ui::MouseEvent* event) override; 160 void OnMouseEvent(ui::MouseEvent* event) override;
166 void OnScrollEvent(ui::ScrollEvent* event) override; 161 void OnScrollEvent(ui::ScrollEvent* event) override;
167 void OnGestureEvent(ui::GestureEvent* event) override; 162 void OnGestureEvent(ui::GestureEvent* event) override;
168 163
169 mus::Window* window_; 164 mus::Window* window_;
170 165
171 mojo::Shell* shell_; 166 mojo::Shell* shell_;
172 167
173 internal::NativeWidgetDelegate* native_widget_delegate_; 168 internal::NativeWidgetDelegate* native_widget_delegate_;
174 169
175 mus::mojom::WindowManager* window_manager_;
176 mus::mojom::ShowState show_state_before_fullscreen_; 170 mus::mojom::ShowState show_state_before_fullscreen_;
177 171
178 // Aura configuration. 172 // Aura configuration.
179 scoped_ptr<WindowTreeHostMojo> window_tree_host_; 173 scoped_ptr<WindowTreeHostMojo> window_tree_host_;
180 aura::Window* content_; 174 aura::Window* content_;
181 scoped_ptr<wm::FocusController> focus_client_; 175 scoped_ptr<wm::FocusController> focus_client_;
182 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 176 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
183 177
184 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); 178 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
185 }; 179 };
186 180
187 } // namespace views 181 } // namespace views
188 182
189 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 183 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
OLDNEW
« no previous file with comments | « mandoline/ui/phone_ui/phone_browser_application_delegate.cc ('k') | ui/views/mus/native_widget_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698