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

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

Issue 434343004: Call OnNativeWindowChanged after maximizing and restoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 6 years, 4 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_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "ui/aura/client/focus_change_observer.h" 10 #include "ui/aura/client/focus_change_observer.h"
11 #include "ui/aura/window_delegate.h" 11 #include "ui/aura/window_delegate.h"
12 #include "ui/aura/window_observer.h"
12 #include "ui/base/cursor/cursor.h" 13 #include "ui/base/cursor/cursor.h"
13 #include "ui/events/event_constants.h" 14 #include "ui/events/event_constants.h"
14 #include "ui/views/ime/input_method_delegate.h" 15 #include "ui/views/ime/input_method_delegate.h"
15 #include "ui/views/views_export.h" 16 #include "ui/views/views_export.h"
16 #include "ui/views/widget/native_widget_private.h" 17 #include "ui/views/widget/native_widget_private.h"
17 #include "ui/wm/public/activation_change_observer.h" 18 #include "ui/wm/public/activation_change_observer.h"
18 #include "ui/wm/public/activation_delegate.h" 19 #include "ui/wm/public/activation_delegate.h"
19 #include "ui/wm/public/drag_drop_delegate.h" 20 #include "ui/wm/public/drag_drop_delegate.h"
20 21
21 namespace aura { 22 namespace aura {
22 class Window; 23 class Window;
23 } 24 }
24 namespace gfx { 25 namespace gfx {
25 class FontList; 26 class FontList;
26 } 27 }
27 28
28 namespace views { 29 namespace views {
29 30
30 class DropHelper; 31 class DropHelper;
31 class TooltipManagerAura; 32 class TooltipManagerAura;
32 class WindowReorderer; 33 class WindowReorderer;
33 34
34 class VIEWS_EXPORT NativeWidgetAura 35 class VIEWS_EXPORT NativeWidgetAura
35 : public internal::NativeWidgetPrivate, 36 : public internal::NativeWidgetPrivate,
36 public internal::InputMethodDelegate, 37 public internal::InputMethodDelegate,
37 public aura::WindowDelegate, 38 public aura::WindowDelegate,
39 public aura::WindowObserver,
38 public aura::client::ActivationDelegate, 40 public aura::client::ActivationDelegate,
39 public aura::client::ActivationChangeObserver, 41 public aura::client::ActivationChangeObserver,
40 public aura::client::FocusChangeObserver, 42 public aura::client::FocusChangeObserver,
41 public aura::client::DragDropDelegate { 43 public aura::client::DragDropDelegate {
42 public: 44 public:
43 explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate); 45 explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate);
44 46
45 // Called internally by NativeWidgetAura and DesktopNativeWidgetAura to 47 // Called internally by NativeWidgetAura and DesktopNativeWidgetAura to
46 // associate |native_widget| with |window|. 48 // associate |native_widget| with |window|.
47 static void RegisterNativeWidgetForWindow( 49 static void RegisterNativeWidgetForWindow(
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 virtual bool CanFocus() OVERRIDE; 153 virtual bool CanFocus() OVERRIDE;
152 virtual void OnCaptureLost() OVERRIDE; 154 virtual void OnCaptureLost() OVERRIDE;
153 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 155 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
154 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 156 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
155 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 157 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
156 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 158 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
157 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; 159 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
158 virtual bool HasHitTestMask() const OVERRIDE; 160 virtual bool HasHitTestMask() const OVERRIDE;
159 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 161 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
160 162
163 // Overridden from aura::WindowObserver:
164 virtual void OnWindowPropertyChanged(aura::Window* window,
165 const void* key,
166 intptr_t old) OVERRIDE;
167
161 // Overridden from ui::EventHandler: 168 // Overridden from ui::EventHandler:
162 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 169 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
163 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 170 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
164 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 171 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
165 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 172 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
166 173
167 // Overridden from aura::client::ActivationDelegate: 174 // Overridden from aura::client::ActivationDelegate:
168 virtual bool ShouldActivate() const OVERRIDE; 175 virtual bool ShouldActivate() const OVERRIDE;
169 176
170 // Overridden from aura::client::ActivationChangeObserver: 177 // Overridden from aura::client::ActivationChangeObserver:
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 228
222 scoped_ptr<DropHelper> drop_helper_; 229 scoped_ptr<DropHelper> drop_helper_;
223 int last_drop_operation_; 230 int last_drop_operation_;
224 231
225 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 232 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
226 }; 233 };
227 234
228 } // namespace views 235 } // namespace views
229 236
230 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 237 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/widget/native_widget_aura.cc » ('j') | ui/views/widget/native_widget_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698