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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Issue 36473003: Rename StackingClient -> WindowTreeClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: done. Created 7 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 | Annotate | Revision Log
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 "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "ui/aura/client/activation_change_observer.h" 9 #include "ui/aura/client/activation_change_observer.h"
10 #include "ui/aura/client/activation_delegate.h" 10 #include "ui/aura/client/activation_delegate.h"
11 #include "ui/aura/client/drag_drop_delegate.h" 11 #include "ui/aura/client/drag_drop_delegate.h"
12 #include "ui/aura/client/focus_change_observer.h" 12 #include "ui/aura/client/focus_change_observer.h"
13 #include "ui/aura/root_window_observer.h" 13 #include "ui/aura/root_window_observer.h"
14 #include "ui/aura/window_delegate.h" 14 #include "ui/aura/window_delegate.h"
15 #include "ui/base/cursor/cursor.h" 15 #include "ui/base/cursor/cursor.h"
16 #include "ui/views/ime/input_method_delegate.h" 16 #include "ui/views/ime/input_method_delegate.h"
17 #include "ui/views/widget/native_widget_private.h" 17 #include "ui/views/widget/native_widget_private.h"
18 18
19 namespace aura { 19 namespace aura {
20 class RootWindow; 20 class RootWindow;
21 namespace client { 21 namespace client {
22 class StackingClient; 22 class WindowTreeClient;
23 } 23 }
24 } 24 }
25 25
26 namespace views { 26 namespace views {
27 27
28 namespace corewm { 28 namespace corewm {
29 class CompoundEventFilter; 29 class CompoundEventFilter;
30 class InputMethodEventFilter; 30 class InputMethodEventFilter;
31 class ShadowController; 31 class ShadowController;
32 class TooltipController; 32 class TooltipController;
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 // from under us. 256 // from under us.
257 aura::Window* window_; 257 aura::Window* window_;
258 258
259 // Contains the content window defined above. Ensures that ZOrder changes 259 // Contains the content window defined above. Ensures that ZOrder changes
260 // occurring in the content window hierarchy don't affect the other children 260 // occurring in the content window hierarchy don't affect the other children
261 // of the root window. 261 // of the root window.
262 aura::Window* content_window_container_; 262 aura::Window* content_window_container_;
263 263
264 internal::NativeWidgetDelegate* native_widget_delegate_; 264 internal::NativeWidgetDelegate* native_widget_delegate_;
265 265
266 scoped_ptr<aura::client::StackingClient> stacking_client_; 266 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
267 267
268 // Toplevel event filter which dispatches to other event filters. 268 // Toplevel event filter which dispatches to other event filters.
269 corewm::CompoundEventFilter* root_window_event_filter_; 269 corewm::CompoundEventFilter* root_window_event_filter_;
270 270
271 scoped_ptr<corewm::InputMethodEventFilter> input_method_event_filter_; 271 scoped_ptr<corewm::InputMethodEventFilter> input_method_event_filter_;
272 272
273 scoped_ptr<DropHelper> drop_helper_; 273 scoped_ptr<DropHelper> drop_helper_;
274 int last_drop_operation_; 274 int last_drop_operation_;
275 275
276 scoped_ptr<corewm::TooltipController> tooltip_controller_; 276 scoped_ptr<corewm::TooltipController> tooltip_controller_;
(...skipping 17 matching lines...) Expand all
294 294
295 // See class documentation for Widget in widget.h for a note about type. 295 // See class documentation for Widget in widget.h for a note about type.
296 Widget::InitParams::Type widget_type_; 296 Widget::InitParams::Type widget_type_;
297 297
298 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 298 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
299 }; 299 };
300 300
301 } // namespace views 301 } // namespace views
302 302
303 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 303 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/corewm/shadow_controller_unittest.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