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

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

Issue 1967543002: Move ShowState-related code from PlatformWindowMus to NativeWidgetMus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactor show_state checks Created 4 years, 7 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 | « 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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 void OnMouseEvent(ui::MouseEvent* event) override; 201 void OnMouseEvent(ui::MouseEvent* event) override;
202 void OnScrollEvent(ui::ScrollEvent* event) override; 202 void OnScrollEvent(ui::ScrollEvent* event) override;
203 void OnGestureEvent(ui::GestureEvent* event) override; 203 void OnGestureEvent(ui::GestureEvent* event) override;
204 204
205 // Overridden from aura::WindowTreeHostObserver: 205 // Overridden from aura::WindowTreeHostObserver:
206 void OnHostCloseRequested(const aura::WindowTreeHost* host) override; 206 void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
207 207
208 private: 208 private:
209 class MusWindowObserver; 209 class MusWindowObserver;
210 210
211 void SetShowState(mus::mojom::ShowState show_state);
212
211 void OnMusWindowVisibilityChanging(mus::Window* window); 213 void OnMusWindowVisibilityChanging(mus::Window* window);
212 void OnMusWindowVisibilityChanged(mus::Window* window); 214 void OnMusWindowVisibilityChanged(mus::Window* window);
213 215
214 mus::Window* window_; 216 mus::Window* window_;
215 217
216 internal::NativeWidgetDelegate* native_widget_delegate_; 218 internal::NativeWidgetDelegate* native_widget_delegate_;
217 219
218 const mus::mojom::SurfaceType surface_type_; 220 const mus::mojom::SurfaceType surface_type_;
219 ui::PlatformWindowState show_state_before_fullscreen_; 221 mus::mojom::ShowState show_state_before_fullscreen_;
220 222
221 // See class documentation for Widget in widget.h for a note about ownership. 223 // See class documentation for Widget in widget.h for a note about ownership.
222 Widget::InitParams::Ownership ownership_; 224 Widget::InitParams::Ownership ownership_;
223 225
224 // Functions with the same name require the mus::WindowObserver to be in 226 // Functions with the same name require the mus::WindowObserver to be in
225 // a separate class. 227 // a separate class.
226 std::unique_ptr<MusWindowObserver> mus_window_observer_; 228 std::unique_ptr<MusWindowObserver> mus_window_observer_;
227 229
228 // Aura configuration. 230 // Aura configuration.
229 std::unique_ptr<SurfaceContextFactory> context_factory_; 231 std::unique_ptr<SurfaceContextFactory> context_factory_;
230 std::unique_ptr<WindowTreeHostMus> window_tree_host_; 232 std::unique_ptr<WindowTreeHostMus> window_tree_host_;
231 aura::Window* content_; 233 aura::Window* content_;
232 std::unique_ptr<wm::FocusController> focus_client_; 234 std::unique_ptr<wm::FocusController> focus_client_;
233 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; 235 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_;
234 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; 236 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_;
235 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; 237 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
236 std::unique_ptr<wm::CursorManager> cursor_manager_; 238 std::unique_ptr<wm::CursorManager> cursor_manager_;
237 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; 239 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
238 240
239 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); 241 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
240 }; 242 };
241 243
242 } // namespace views 244 } // namespace views
243 245
244 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 246 #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