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

Unified Diff: chrome/browser/ui/views/app_launched_animation_win.cc

Issue 6294015: [NTP] Remove app launch animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyrights Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/dom_ui/app_launcher_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/app_launched_animation_win.cc
diff --git a/chrome/browser/ui/views/app_launched_animation_win.cc b/chrome/browser/ui/views/app_launched_animation_win.cc
deleted file mode 100644
index a2007d32e3c1b2948da2738736902ab9e8001cd1..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/app_launched_animation_win.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/app_launched_animation.h"
-
-#include "chrome/browser/extensions/image_loading_tracker.h"
-#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_icon_set.h"
-#include "chrome/common/extensions/extension_resource.h"
-#include "gfx/rect.h"
-#include "ui/base/animation/animation.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
-#include "views/controls/image_view.h"
-#include "views/widget/widget_win.h"
-
-namespace {
-
-// Start at 1, end at 0
-// 0ms You click the icon
-// 0ms The launcher and contents begins to fade out, the icon
-// you clicked does not (stays opaque)
-// 0ms The app begins loading behind the launcher
-// +100ms The app icon begins to fade out.
-// +200ms The launcher finishes fading out
-// +350ms The app icon finishes fading out
-
-// How long the fade should take.
-static const int kDurationMS = 250;
-
-// The delay before the fade out should start.
-static const int kDelayMS = 100;
-
-// AppLaunchedAnimation creates an animation. It loads the icon for the
-// extension and once the image is loaded the animation starts. The icon fades
-// out after a short delay.
-class AppLaunchedAnimationWin : public ui::AnimationDelegate,
- public ImageLoadingTracker::Observer,
- public views::ImageView {
- public:
- AppLaunchedAnimationWin(const Extension* extension, const gfx::Rect& rect);
-
- private:
- // ui::AnimationDelegate
- virtual void AnimationProgressed(const ui::Animation* animation);
- virtual void AnimationCanceled(const ui::Animation* animation);
- virtual void AnimationEnded(const ui::Animation* animation);
-
- // We use a HWND for the popup so that it may float above any HWNDs in our UI.
- views::WidgetWin* popup_;
-
- // The rect to use for the popup.
- gfx::Rect rect_;
-
- // Used for loading extension application icon.
- ImageLoadingTracker app_icon_loader_;
-
- // ImageLoadingTracker::Observer.
- virtual void OnImageLoaded(SkBitmap* image, ExtensionResource resource,
- int index);
-
- // Hover animation.
- scoped_ptr<ui::SlideAnimation> animation_;
-
- DISALLOW_COPY_AND_ASSIGN(AppLaunchedAnimationWin);
-};
-
-AppLaunchedAnimationWin::AppLaunchedAnimationWin(const Extension* extension,
- const gfx::Rect& rect)
- : popup_(NULL),
- rect_(rect),
- ALLOW_THIS_IN_INITIALIZER_LIST(app_icon_loader_(this)) {
- DCHECK(extension);
- app_icon_loader_.LoadImage(
- extension,
- extension->GetIconResource(Extension::EXTENSION_ICON_LARGE,
- ExtensionIconSet::MATCH_EXACTLY),
- rect_.size(),
- ImageLoadingTracker::DONT_CACHE);
-}
-
-void AppLaunchedAnimationWin::AnimationCanceled(
- const ui::Animation* animation) {
- AnimationEnded(animation);
-}
-
-void AppLaunchedAnimationWin::AnimationEnded(const ui::Animation* animation) {
- popup_->Close();
-}
-
-void AppLaunchedAnimationWin::AnimationProgressed(
- const ui::Animation* animation) {
- // GetCurrentValue goes from 1 to 0 since we are hiding.
- const double current_value = 1.0 - animation->GetCurrentValue();
- const double current_time = current_value * (kDelayMS + kDurationMS);
-
- double opacity = 1.0 -
- std::max(0.0, static_cast<double>(current_time - kDelayMS)) /
- static_cast<double>(kDurationMS);
-
- popup_->SetOpacity(static_cast<SkColor>(opacity * 255.0));
- SchedulePaint();
-}
-
-void AppLaunchedAnimationWin::OnImageLoaded(SkBitmap* image,
- ExtensionResource resource,
- int index) {
- if (image) {
- SetImage(image);
-
- popup_ = new views::WidgetWin;
- popup_->set_window_style(WS_POPUP);
- popup_->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW |
- WS_EX_TRANSPARENT);
- popup_->SetOpacity(static_cast<SkColor>(255));
-
- popup_->Init(NULL, rect_);
- popup_->SetContentsView(this);
- popup_->Show();
-
- // Start animation.
- animation_.reset(new ui::SlideAnimation(this));
- animation_->SetSlideDuration(kDelayMS + kDurationMS);
- animation_->SetTweenType(ui::Tween::LINEAR);
- animation_->Reset(1.0);
- animation_->Hide();
- }
-}
-
-} // namespace
-
-// static
-void AppLaunchedAnimation::Show(const Extension* extension,
- const gfx::Rect& rect) {
- // The animation will delete itself when it's finished.
- new AppLaunchedAnimationWin(extension, rect);
-}
« no previous file with comments | « chrome/browser/dom_ui/app_launcher_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698