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

Side by Side Diff: ui/aura/window.h

Issue 8395046: Allows observers to be notified when layer animations complete. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with master 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
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 UI_AURA_WINDOW_H_ 5 #ifndef UI_AURA_WINDOW_H_
6 #define UI_AURA_WINDOW_H_ 6 #define UI_AURA_WINDOW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 // furthest down the hierarchy) Window containing the point; otherwise, 299 // furthest down the hierarchy) Window containing the point; otherwise,
300 // returns the loosest. If |for_event_handling| is true, then hit-test masks 300 // returns the loosest. If |for_event_handling| is true, then hit-test masks
301 // and StopsEventPropagation() are honored; otherwise, only bounds checks are 301 // and StopsEventPropagation() are honored; otherwise, only bounds checks are
302 // performed. 302 // performed.
303 Window* GetWindowForPoint(const gfx::Point& local_point, 303 Window* GetWindowForPoint(const gfx::Point& local_point,
304 bool return_tightest, 304 bool return_tightest,
305 bool for_event_handling); 305 bool for_event_handling);
306 306
307 // Overridden from ui::LayerDelegate: 307 // Overridden from ui::LayerDelegate:
308 virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; 308 virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
309 virtual void OnLayerAnimationEnded(
310 const ui::LayerAnimationSequence* animation) OVERRIDE;
311 309
312 int type_; 310 int type_;
313 311
314 WindowDelegate* delegate_; 312 WindowDelegate* delegate_;
315 313
316 ui::WindowShowState show_state_; 314 ui::WindowShowState show_state_;
317 315
318 // The original bounds of a maximized/fullscreen window. 316 // The original bounds of a maximized/fullscreen window.
319 gfx::Rect restore_bounds_; 317 gfx::Rect restore_bounds_;
320 318
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 // TODO(oshima): Consolidcate ViewProp and aura::window property 352 // TODO(oshima): Consolidcate ViewProp and aura::window property
355 // implementation. 353 // implementation.
356 std::map<const char*, ui::ViewProp*> prop_map_; 354 std::map<const char*, ui::ViewProp*> prop_map_;
357 355
358 DISALLOW_COPY_AND_ASSIGN(Window); 356 DISALLOW_COPY_AND_ASSIGN(Window);
359 }; 357 };
360 358
361 } // namespace aura 359 } // namespace aura
362 360
363 #endif // UI_AURA_WINDOW_H_ 361 #endif // UI_AURA_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698