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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "ui/aura/client/focus_change_observer.h" 12 #include "ui/aura/client/focus_change_observer.h"
13 #include "ui/aura/window_delegate.h" 13 #include "ui/aura/window_delegate.h"
14 #include "ui/aura/window_tree_host_observer.h" 14 #include "ui/aura/window_tree_host_observer.h"
15 #include "ui/base/cursor/cursor.h" 15 #include "ui/base/cursor/cursor.h"
16 #include "ui/views/widget/native_widget_private.h" 16 #include "ui/views/widget/native_widget_private.h"
17 #include "ui/wm/core/compound_event_filter.h" 17 #include "ui/wm/core/compound_event_filter.h"
18 #include "ui/wm/public/activation_change_observer.h" 18 #include "ui/wm/public/activation_change_observer.h"
19 #include "ui/wm/public/activation_delegate.h" 19 #include "ui/wm/public/activation_delegate.h"
20 #include "ui/wm/public/drag_drop_delegate.h" 20 #include "ui/wm/public/drag_drop_delegate.h"
21 21
22 namespace aura { 22 namespace aura {
23 class WindowEventDispatcher; 23 class WindowEventDispatcher;
24 class WindowTreeHost; 24 class WindowTreeHost;
25 namespace client { 25 namespace client {
26 class DragDropClient; 26 class DragDropClient;
27 class FocusClient; 27 class FocusClient;
28 class ScreenPositionClient; 28 class ScreenPositionClient;
29 class WindowTreeClient; 29 class WindowParentingClient;
30 } 30 }
31 } 31 }
32 32
33 namespace wm { 33 namespace wm {
34 class CompoundEventFilter; 34 class CompoundEventFilter;
35 class CursorManager; 35 class CursorManager;
36 class FocusController; 36 class FocusController;
37 class ShadowController; 37 class ShadowController;
38 class VisibilityController; 38 class VisibilityController;
39 class WindowModalityController; 39 class WindowModalityController;
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 // Child of |content_window_container_|. This is the return value from 256 // Child of |content_window_container_|. This is the return value from
257 // GetNativeView(). 257 // GetNativeView().
258 // WARNING: this may be NULL, in particular during shutdown it becomes NULL. 258 // WARNING: this may be NULL, in particular during shutdown it becomes NULL.
259 aura::Window* content_window_; 259 aura::Window* content_window_;
260 260
261 internal::NativeWidgetDelegate* native_widget_delegate_; 261 internal::NativeWidgetDelegate* native_widget_delegate_;
262 262
263 std::unique_ptr<wm::FocusController> focus_client_; 263 std::unique_ptr<wm::FocusController> focus_client_;
264 std::unique_ptr<aura::client::ScreenPositionClient> position_client_; 264 std::unique_ptr<aura::client::ScreenPositionClient> position_client_;
265 std::unique_ptr<aura::client::DragDropClient> drag_drop_client_; 265 std::unique_ptr<aura::client::DragDropClient> drag_drop_client_;
266 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; 266 std::unique_ptr<aura::client::WindowParentingClient> window_parenting_client_;
267 std::unique_ptr<DesktopEventClient> event_client_; 267 std::unique_ptr<DesktopEventClient> event_client_;
268 std::unique_ptr<FocusManagerEventHandler> focus_manager_event_handler_; 268 std::unique_ptr<FocusManagerEventHandler> focus_manager_event_handler_;
269 269
270 // Toplevel event filter which dispatches to other event filters. 270 // Toplevel event filter which dispatches to other event filters.
271 std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_; 271 std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_;
272 272
273 std::unique_ptr<DropHelper> drop_helper_; 273 std::unique_ptr<DropHelper> drop_helper_;
274 int last_drop_operation_; 274 int last_drop_operation_;
275 275
276 std::unique_ptr<corewm::TooltipController> tooltip_controller_; 276 std::unique_ptr<corewm::TooltipController> tooltip_controller_;
(...skipping 28 matching lines...) Expand all
305 // The following factory is used for calls to close the NativeWidgetAura 305 // The following factory is used for calls to close the NativeWidgetAura
306 // instance. 306 // instance.
307 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_; 307 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_;
308 308
309 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 309 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
310 }; 310 };
311 311
312 } // namespace views 312 } // namespace views
313 313
314 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 314 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/mus/native_widget_mus.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698