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

Side by Side Diff: views/widget/native_widget_aura.h

Issue 8417025: aura: Update how the tooltip manager works. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 1 month 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 | « no previous file | views/widget/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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "ui/aura/window_delegate.h" 11 #include "ui/aura/window_delegate.h"
12 #include "ui/base/events.h" 12 #include "ui/base/events.h"
13 #include "views/views_export.h" 13 #include "views/views_export.h"
14 #include "views/widget/native_widget_private.h" 14 #include "views/widget/native_widget_private.h"
15 15
16 namespace aura { 16 namespace aura {
17 class Window; 17 class Window;
18 } 18 }
19 namespace gfx { 19 namespace gfx {
20 class Font; 20 class Font;
21 } 21 }
22 22
23 namespace views { 23 namespace views {
24 24
25 class TooltipManagerViews;
26
25 class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate, 27 class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
26 public aura::WindowDelegate { 28 public aura::WindowDelegate {
27 public: 29 public:
28 explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate); 30 explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate);
29 virtual ~NativeWidgetAura(); 31 virtual ~NativeWidgetAura();
30 32
31 // TODO(beng): Find a better place for this, and the similar method on 33 // TODO(beng): Find a better place for this, and the similar method on
32 // NativeWidgetWin. 34 // NativeWidgetWin.
33 static gfx::Font GetWindowTitleFont(); 35 static gfx::Font GetWindowTitleFont();
34 36
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 Widget::InitParams::Ownership ownership_; 153 Widget::InitParams::Ownership ownership_;
152 154
153 // The following factory is used for calls to close the NativeWidgetAura 155 // The following factory is used for calls to close the NativeWidgetAura
154 // instance. 156 // instance.
155 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_; 157 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
156 158
157 bool can_activate_; 159 bool can_activate_;
158 160
159 gfx::NativeCursor cursor_; 161 gfx::NativeCursor cursor_;
160 162
161 scoped_ptr<TooltipManager> tooltip_manager_; 163 scoped_ptr<TooltipManagerViews> tooltip_manager_;
162 164
163 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 165 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
164 }; 166 };
165 167
166 } // namespace views 168 } // namespace views
167 169
168 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 170 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698