chrome/browser/dom_ui/ntp_resource_cache.cc - Issue 6154001: Move animation code to new ui/base/animation directory....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/dom_ui/ntp_resource_cache.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:

Index: chrome/browser/dom_ui/ntp_resource_cache.cc

===================================================================

--- chrome/browser/dom_ui/ntp_resource_cache.cc (revision 70685)

+++ chrome/browser/dom_ui/ntp_resource_cache.cc (working copy)

@@ -7,7 +7,6 @@

#include <algorithm>

#include <vector>

-#include "app/animation.h"

#include "app/l10n_util.h"

#include "app/resource_bundle.h"

#include "app/theme_provider.h"

@@ -41,6 +40,7 @@

#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

#include "grit/theme_resources.h"

+#include "ui/base/animation/animation.h"

#if defined(OS_WIN) || defined(TOOLKIT_VIEWS)

#include "chrome/browser/views/bookmark_bar_view.h"

@@ -352,7 +352,7 @@

// Control fade and resize animations.

std::string anim =

- Animation::ShouldRenderRichAnimation() ? "true" : "false";

+ ui::Animation::ShouldRenderRichAnimation() ? "true" : "false";

localized_strings.SetString("anim", anim);

// Pass the shown_sections pref early so that we can prevent flicker.

« no previous file with comments | « chrome/browser/dom_ui/app_launcher_handler.cc ('k') | chrome/browser/gtk/bookmark_bar_gtk.h » ('j') | no next file with comments »