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

Unified Diff: chrome/browser/dom_ui/app_launcher_handler.cc

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' 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/chromeos/wm_overview_controller.h ('k') | chrome/browser/dom_ui/ntp_resource_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/app_launcher_handler.cc
===================================================================
--- chrome/browser/dom_ui/app_launcher_handler.cc (revision 70685)
+++ chrome/browser/dom_ui/app_launcher_handler.cc (working copy)
@@ -4,7 +4,6 @@
#include "chrome/browser/dom_ui/app_launcher_handler.h"
-#include "app/animation.h"
#include "base/metrics/histogram.h"
#include "base/string_number_conversions.h"
#include "base/string_split.h"
@@ -32,6 +31,7 @@
#include "gfx/rect.h"
#include "grit/browser_resources.h"
#include "grit/generated_resources.h"
+#include "ui/base/animation/animation.h"
namespace {
@@ -410,7 +410,7 @@
const gfx::Rect& rect) {
// We make this check for the case of minimized windows, unit tests, etc.
if (platform_util::IsVisible(dom_ui_->tab_contents()->GetNativeView()) &&
- Animation::ShouldRenderRichAnimation()) {
+ ui::Animation::ShouldRenderRichAnimation()) {
#if defined(OS_WIN)
AppLaunchedAnimation::Show(extension, rect);
#else
« no previous file with comments | « chrome/browser/chromeos/wm_overview_controller.h ('k') | chrome/browser/dom_ui/ntp_resource_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698