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

Unified Diff: chrome/browser/ui/tabs/tab_utils.cc

Issue 657333002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
Index: chrome/browser/ui/tabs/tab_utils.cc
diff --git a/chrome/browser/ui/tabs/tab_utils.cc b/chrome/browser/ui/tabs/tab_utils.cc
index 59ddbaeb1d724250c75eef765e06f646a304449a..523db5fd4200d9130f085e25d5952510acd4b35a 100644
--- a/chrome/browser/ui/tabs/tab_utils.cc
+++ b/chrome/browser/ui/tabs/tab_utils.cc
@@ -183,7 +183,7 @@ scoped_ptr<gfx::Animation> CreateTabMediaIndicatorFadeAnimation(
TabMediaState media_state) {
if (media_state == TAB_MEDIA_STATE_RECORDING ||
media_state == TAB_MEDIA_STATE_CAPTURING) {
- return TabRecordingIndicatorAnimation::Create().PassAs<gfx::Animation>();
+ return TabRecordingIndicatorAnimation::Create();
}
// Note: While it seems silly to use a one-part MultiAnimation, it's the only
@@ -198,7 +198,7 @@ scoped_ptr<gfx::Animation> CreateTabMediaIndicatorFadeAnimation(
scoped_ptr<gfx::MultiAnimation> animation(
new gfx::MultiAnimation(parts, interval));
animation->set_continuous(false);
- return animation.PassAs<gfx::Animation>();
+ return animation.Pass();
}
base::string16 AssembleTabTooltipText(const base::string16& title,
« no previous file with comments | « chrome/browser/ui/search/search_tab_helper.cc ('k') | chrome/browser/ui/views/autofill/decorated_textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698