OLD | NEW |
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 #include "chrome/browser/extensions/extension_action.h" | 5 #include "chrome/browser/extensions/extension_action.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "chrome/common/badge_util.h" | 12 #include "chrome/common/badge_util.h" |
13 #include "chrome/common/extensions/extension_constants.h" | 13 #include "chrome/common/extensions/extension_constants.h" |
14 #include "chrome/common/icon_with_badge_image_source.h" | 14 #include "chrome/common/icon_with_badge_image_source.h" |
15 #include "grit/theme_resources.h" | 15 #include "grit/theme_resources.h" |
16 #include "grit/ui_resources.h" | 16 #include "grit/ui_resources.h" |
17 #include "third_party/skia/include/core/SkBitmap.h" | 17 #include "third_party/skia/include/core/SkBitmap.h" |
18 #include "third_party/skia/include/core/SkBitmapDevice.h" | 18 #include "third_party/skia/include/core/SkBitmapDevice.h" |
19 #include "third_party/skia/include/core/SkCanvas.h" | 19 #include "third_party/skia/include/core/SkCanvas.h" |
20 #include "third_party/skia/include/core/SkPaint.h" | 20 #include "third_party/skia/include/core/SkPaint.h" |
21 #include "third_party/skia/include/effects/SkGradientShader.h" | 21 #include "third_party/skia/include/effects/SkGradientShader.h" |
22 #include "ui/base/animation/animation_delegate.h" | |
23 #include "ui/base/resource/resource_bundle.h" | 22 #include "ui/base/resource/resource_bundle.h" |
| 23 #include "ui/gfx/animation/animation_delegate.h" |
24 #include "ui/gfx/canvas.h" | 24 #include "ui/gfx/canvas.h" |
25 #include "ui/gfx/color_utils.h" | 25 #include "ui/gfx/color_utils.h" |
26 #include "ui/gfx/image/image.h" | 26 #include "ui/gfx/image/image.h" |
27 #include "ui/gfx/image/image_skia.h" | 27 #include "ui/gfx/image/image_skia.h" |
28 #include "ui/gfx/image/image_skia_source.h" | 28 #include "ui/gfx/image/image_skia_source.h" |
29 #include "ui/gfx/rect.h" | 29 #include "ui/gfx/rect.h" |
30 #include "ui/gfx/size.h" | 30 #include "ui/gfx/size.h" |
31 #include "ui/gfx/skbitmap_operations.h" | 31 #include "ui/gfx/skbitmap_operations.h" |
32 #include "url/gurl.h" | 32 #include "url/gurl.h" |
33 | 33 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 | 86 |
87 DISALLOW_COPY_AND_ASSIGN(AnimatedIconImageSource); | 87 DISALLOW_COPY_AND_ASSIGN(AnimatedIconImageSource); |
88 }; | 88 }; |
89 | 89 |
90 const int ExtensionAction::kDefaultTabId = -1; | 90 const int ExtensionAction::kDefaultTabId = -1; |
91 // 100ms animation at 50fps (so 5 animation frames in total). | 91 // 100ms animation at 50fps (so 5 animation frames in total). |
92 const int kIconFadeInDurationMs = 100; | 92 const int kIconFadeInDurationMs = 100; |
93 const int kIconFadeInFramesPerSecond = 50; | 93 const int kIconFadeInFramesPerSecond = 50; |
94 | 94 |
95 ExtensionAction::IconAnimation::IconAnimation() | 95 ExtensionAction::IconAnimation::IconAnimation() |
96 : ui::LinearAnimation(kIconFadeInDurationMs, kIconFadeInFramesPerSecond, | 96 : gfx::LinearAnimation(kIconFadeInDurationMs, kIconFadeInFramesPerSecond, |
97 NULL), | 97 NULL), |
98 weak_ptr_factory_(this) {} | 98 weak_ptr_factory_(this) {} |
99 | 99 |
100 ExtensionAction::IconAnimation::~IconAnimation() { | 100 ExtensionAction::IconAnimation::~IconAnimation() { |
101 // Make sure observers don't access *this after its destructor has started. | 101 // Make sure observers don't access *this after its destructor has started. |
102 weak_ptr_factory_.InvalidateWeakPtrs(); | 102 weak_ptr_factory_.InvalidateWeakPtrs(); |
103 // In case the animation was destroyed before it finished (likely due to | 103 // In case the animation was destroyed before it finished (likely due to |
104 // delays in timer scheduling), make sure it's fully visible. | 104 // delays in timer scheduling), make sure it's fully visible. |
105 FOR_EACH_OBSERVER(Observer, observers_, OnIconChanged()); | 105 FOR_EACH_OBSERVER(Observer, observers_, OnIconChanged()); |
106 } | 106 } |
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
392 icon_animation->Start(); | 392 icon_animation->Start(); |
393 // After the icon is finished fading in (plus some padding to handle random | 393 // After the icon is finished fading in (plus some padding to handle random |
394 // timer delays), destroy it. We use a delayed task so that the Animation is | 394 // timer delays), destroy it. We use a delayed task so that the Animation is |
395 // deleted even if it hasn't finished by the time the MessageLoop is | 395 // deleted even if it hasn't finished by the time the MessageLoop is |
396 // destroyed. | 396 // destroyed. |
397 base::MessageLoop::current()->PostDelayedTask( | 397 base::MessageLoop::current()->PostDelayedTask( |
398 FROM_HERE, | 398 FROM_HERE, |
399 base::Bind(&DestroyIconAnimation, base::Passed(&icon_animation)), | 399 base::Bind(&DestroyIconAnimation, base::Passed(&icon_animation)), |
400 base::TimeDelta::FromMilliseconds(kIconFadeInDurationMs * 2)); | 400 base::TimeDelta::FromMilliseconds(kIconFadeInDurationMs * 2)); |
401 } | 401 } |
OLD | NEW |