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

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

Issue 693523003: MacViews: Put wm window animation calls behind an interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@views-clipboard
Patch Set: Created 6 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
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/focus_change_observer.h" 9 #include "ui/aura/client/focus_change_observer.h"
10 #include "ui/aura/window_delegate.h" 10 #include "ui/aura/window_delegate.h"
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 void SetCursor(gfx::NativeCursor cursor) override; 166 void SetCursor(gfx::NativeCursor cursor) override;
167 bool IsMouseEventsEnabled() const override; 167 bool IsMouseEventsEnabled() const override;
168 void ClearNativeFocus() override; 168 void ClearNativeFocus() override;
169 gfx::Rect GetWorkAreaBoundsInScreen() const override; 169 gfx::Rect GetWorkAreaBoundsInScreen() const override;
170 Widget::MoveLoopResult RunMoveLoop( 170 Widget::MoveLoopResult RunMoveLoop(
171 const gfx::Vector2d& drag_offset, 171 const gfx::Vector2d& drag_offset,
172 Widget::MoveLoopSource source, 172 Widget::MoveLoopSource source,
173 Widget::MoveLoopEscapeBehavior escape_behavior) override; 173 Widget::MoveLoopEscapeBehavior escape_behavior) override;
174 void EndMoveLoop() override; 174 void EndMoveLoop() override;
175 void SetVisibilityChangedAnimationsEnabled(bool value) override; 175 void SetVisibilityChangedAnimationsEnabled(bool value) override;
176 Widget::VisibilityAnimation* GetVisibilityAnimation() const override;
176 ui::NativeTheme* GetNativeTheme() const override; 177 ui::NativeTheme* GetNativeTheme() const override;
177 void OnRootViewLayout() override; 178 void OnRootViewLayout() override;
178 bool IsTranslucentWindowOpacitySupported() const override; 179 bool IsTranslucentWindowOpacitySupported() const override;
179 void OnSizeConstraintsChanged() override; 180 void OnSizeConstraintsChanged() override;
180 void RepostNativeEvent(gfx::NativeEvent native_event) override; 181 void RepostNativeEvent(gfx::NativeEvent native_event) override;
181 182
182 // Overridden from aura::WindowDelegate: 183 // Overridden from aura::WindowDelegate:
183 gfx::Size GetMinimumSize() const override; 184 gfx::Size GetMinimumSize() const override;
184 gfx::Size GetMaximumSize() const override; 185 gfx::Size GetMaximumSize() const override;
185 void OnBoundsChanged(const gfx::Rect& old_bounds, 186 void OnBoundsChanged(const gfx::Rect& old_bounds,
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 302
302 scoped_ptr<wm::ShadowController> shadow_controller_; 303 scoped_ptr<wm::ShadowController> shadow_controller_;
303 304
304 // Reorders child windows of |window_| associated with a view based on the 305 // Reorders child windows of |window_| associated with a view based on the
305 // order of the associated views in the widget's view hierarchy. 306 // order of the associated views in the widget's view hierarchy.
306 scoped_ptr<WindowReorderer> window_reorderer_; 307 scoped_ptr<WindowReorderer> window_reorderer_;
307 308
308 // See class documentation for Widget in widget.h for a note about type. 309 // See class documentation for Widget in widget.h for a note about type.
309 Widget::InitParams::Type widget_type_; 310 Widget::InitParams::Type widget_type_;
310 311
312 scoped_ptr<Widget::VisibilityAnimation> visibility_animation_;
313
311 // The following factory is used for calls to close the NativeWidgetAura 314 // The following factory is used for calls to close the NativeWidgetAura
312 // instance. 315 // instance.
313 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_; 316 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_;
314 317
315 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 318 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
316 }; 319 };
317 320
318 } // namespace views 321 } // namespace views
319 322
320 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 323 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698