OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "content/browser/web_contents/aura/gesture_nav_simple.h" | 5 #include "content/browser/web_contents/aura/gesture_nav_simple.h" |
6 | 6 |
7 #include "cc/layers/layer.h" | 7 #include "cc/layers/layer.h" |
8 #include "content/browser/frame_host/navigation_controller_impl.h" | 8 #include "content/browser/frame_host/navigation_controller_impl.h" |
9 #include "content/browser/renderer_host/overscroll_controller.h" | 9 #include "content/browser/renderer_host/overscroll_controller.h" |
10 #include "content/browser/web_contents/web_contents_impl.h" | 10 #include "content/browser/web_contents/web_contents_impl.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 // animation. | 47 // animation. |
48 template <class T> | 48 template <class T> |
49 class DeleteAfterAnimation : public ui::ImplicitAnimationObserver { | 49 class DeleteAfterAnimation : public ui::ImplicitAnimationObserver { |
50 public: | 50 public: |
51 explicit DeleteAfterAnimation(scoped_ptr<T> object) | 51 explicit DeleteAfterAnimation(scoped_ptr<T> object) |
52 : object_(object.Pass()) {} | 52 : object_(object.Pass()) {} |
53 | 53 |
54 private: | 54 private: |
55 friend class base::DeleteHelper<DeleteAfterAnimation<T> >; | 55 friend class base::DeleteHelper<DeleteAfterAnimation<T> >; |
56 | 56 |
57 virtual ~DeleteAfterAnimation() {} | 57 ~DeleteAfterAnimation() override {} |
58 | 58 |
59 // ui::ImplicitAnimationObserver: | 59 // ui::ImplicitAnimationObserver: |
60 virtual void OnImplicitAnimationsCompleted() override { | 60 void OnImplicitAnimationsCompleted() override { |
61 // Deleting an observer when a ScopedLayerAnimationSettings is iterating | 61 // Deleting an observer when a ScopedLayerAnimationSettings is iterating |
62 // over them can cause a crash (which can happen during tests). So instead, | 62 // over them can cause a crash (which can happen during tests). So instead, |
63 // schedule this observer to be deleted soon. | 63 // schedule this observer to be deleted soon. |
64 BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, this); | 64 BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, this); |
65 } | 65 } |
66 | 66 |
67 scoped_ptr<T> object_; | 67 scoped_ptr<T> object_; |
68 DISALLOW_COPY_AND_ASSIGN(DeleteAfterAnimation); | 68 DISALLOW_COPY_AND_ASSIGN(DeleteAfterAnimation); |
69 }; | 69 }; |
70 | 70 |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 clip_layer_->SetBounds(window->layer()->bounds()); | 227 clip_layer_->SetBounds(window->layer()->bounds()); |
228 clip_layer_->SetMasksToBounds(true); | 228 clip_layer_->SetMasksToBounds(true); |
229 clip_layer_->Add(arrow_.get()); | 229 clip_layer_->Add(arrow_.get()); |
230 | 230 |
231 ui::Layer* parent = window->layer()->parent(); | 231 ui::Layer* parent = window->layer()->parent(); |
232 parent->Add(clip_layer_.get()); | 232 parent->Add(clip_layer_.get()); |
233 parent->StackAtTop(clip_layer_.get()); | 233 parent->StackAtTop(clip_layer_.get()); |
234 } | 234 } |
235 | 235 |
236 } // namespace content | 236 } // namespace content |
OLD | NEW |