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

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

Issue 2438853002: Renames aura::client::WindowTreeClient to WindowParentingClient (Closed)
Patch Set: cleanup Created 4 years, 2 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/aura/window_unittest.cc ('k') | 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 12 matching lines...) Expand all
23 #include "ui/views/mus/mus_export.h" 23 #include "ui/views/mus/mus_export.h"
24 #include "ui/views/mus/window_tree_host_mus.h" 24 #include "ui/views/mus/window_tree_host_mus.h"
25 #include "ui/views/widget/native_widget_private.h" 25 #include "ui/views/widget/native_widget_private.h"
26 #include "ui/wm/public/drag_drop_delegate.h" 26 #include "ui/wm/public/drag_drop_delegate.h"
27 27
28 namespace aura { 28 namespace aura {
29 namespace client { 29 namespace client {
30 class DefaultCaptureClient; 30 class DefaultCaptureClient;
31 class DragDropClient; 31 class DragDropClient;
32 class ScreenPositionClient; 32 class ScreenPositionClient;
33 class WindowTreeClient; 33 class WindowParentingClient;
34 } 34 }
35 class Window; 35 class Window;
36 } 36 }
37 37
38 namespace ui { 38 namespace ui {
39 class Window; 39 class Window;
40 class WindowTreeClient; 40 class WindowTreeClient;
41 namespace mojom { 41 namespace mojom {
42 enum class Cursor; 42 enum class Cursor;
43 enum class EventResult; 43 enum class EventResult;
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 285
286 // Receives drop events for |window_|. 286 // Receives drop events for |window_|.
287 std::unique_ptr<DropTargetMus> drop_target_; 287 std::unique_ptr<DropTargetMus> drop_target_;
288 288
289 // Aura configuration. 289 // Aura configuration.
290 std::unique_ptr<WindowTreeHostMus> window_tree_host_; 290 std::unique_ptr<WindowTreeHostMus> window_tree_host_;
291 aura::Window* content_; 291 aura::Window* content_;
292 std::unique_ptr<wm::FocusController> focus_client_; 292 std::unique_ptr<wm::FocusController> focus_client_;
293 std::unique_ptr<MusCaptureClient> capture_client_; 293 std::unique_ptr<MusCaptureClient> capture_client_;
294 std::unique_ptr<aura::client::DragDropClient> drag_drop_client_; 294 std::unique_ptr<aura::client::DragDropClient> drag_drop_client_;
295 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; 295 std::unique_ptr<aura::client::WindowParentingClient> window_parenting_client_;
296 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; 296 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
297 std::unique_ptr<wm::CursorManager> cursor_manager_; 297 std::unique_ptr<wm::CursorManager> cursor_manager_;
298 298
299 std::unique_ptr<DropHelper> drop_helper_; 299 std::unique_ptr<DropHelper> drop_helper_;
300 int last_drop_operation_; 300 int last_drop_operation_;
301 301
302 std::unique_ptr<corewm::TooltipController> tooltip_controller_; 302 std::unique_ptr<corewm::TooltipController> tooltip_controller_;
303 std::unique_ptr<TooltipManagerAura> tooltip_manager_; 303 std::unique_ptr<TooltipManagerAura> tooltip_manager_;
304 304
305 std::unique_ptr<InputMethodMus> input_method_; 305 std::unique_ptr<InputMethodMus> input_method_;
306 306
307 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; 307 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
308 308
309 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); 309 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
310 }; 310 };
311 311
312 } // namespace views 312 } // namespace views
313 313
314 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 314 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
OLDNEW
« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/views/mus/native_widget_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698