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

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

Issue 12342028: make menus, bubbles, etc. top level windows on aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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
« no previous file with comments | « ui/views/views.gyp ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.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 (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"
(...skipping 10 matching lines...) Expand all
21 } 21 }
22 } 22 }
23 23
24 namespace views { 24 namespace views {
25 25
26 namespace corewm { 26 namespace corewm {
27 class CompoundEventFilter; 27 class CompoundEventFilter;
28 class InputMethodEventFilter; 28 class InputMethodEventFilter;
29 class ShadowController; 29 class ShadowController;
30 class TooltipController; 30 class TooltipController;
31 class VisibilityController;
31 } 32 }
32 33
33 class DesktopRootWindowHost; 34 class DesktopRootWindowHost;
34 class DropHelper; 35 class DropHelper;
35 class NativeWidgetAuraWindowObserver; 36 class NativeWidgetAuraWindowObserver;
36 class TooltipManagerAura; 37 class TooltipManagerAura;
37 38
38 // TODO(erg): May also need to be a DragDropDelegate 39 // TODO(erg): May also need to be a DragDropDelegate
39 class VIEWS_EXPORT DesktopNativeWidgetAura 40 class VIEWS_EXPORT DesktopNativeWidgetAura
40 : public internal::NativeWidgetPrivate, 41 : public internal::NativeWidgetPrivate,
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 corewm::CompoundEventFilter* root_window_event_filter_; 222 corewm::CompoundEventFilter* root_window_event_filter_;
222 223
223 scoped_ptr<corewm::InputMethodEventFilter> input_method_event_filter_; 224 scoped_ptr<corewm::InputMethodEventFilter> input_method_event_filter_;
224 225
225 scoped_ptr<DropHelper> drop_helper_; 226 scoped_ptr<DropHelper> drop_helper_;
226 int last_drop_operation_; 227 int last_drop_operation_;
227 228
228 scoped_ptr<corewm::TooltipController> tooltip_controller_; 229 scoped_ptr<corewm::TooltipController> tooltip_controller_;
229 scoped_ptr<TooltipManagerAura> tooltip_manager_; 230 scoped_ptr<TooltipManagerAura> tooltip_manager_;
230 231
232 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
233
231 // See comments in OnLostActive(). 234 // See comments in OnLostActive().
232 bool restore_focus_on_activate_; 235 bool restore_focus_on_activate_;
233 236
234 scoped_ptr<corewm::ShadowController> shadow_controller_; 237 scoped_ptr<corewm::ShadowController> shadow_controller_;
235 238
236 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 239 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
237 }; 240 };
238 241
239 } // namespace views 242 } // namespace views
240 243
241 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 244 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/views.gyp ('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