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

Unified Diff: chrome/browser/ui/views/tabs/tab.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
« no previous file with comments | « chrome/browser/ui/views/settings_api_bubble_helper_views.cc ('k') | chrome/browser/ui/webui/policy_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab.cc
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index e4597ee21ac0ab4be49795c7b83cfaeeac46919e..83280eaaa177efa2d7726d30a35b59eca04f29c8 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -518,8 +518,7 @@ void Tab::SetData(const TabRendererData& data) {
GetMediaIndicatorButton()->TransitionToMediaState(data_.media_state);
if (old.mini != data_.mini) {
- StopAndDeleteAnimation(
- mini_title_change_animation_.PassAs<gfx::Animation>());
+ StopAndDeleteAnimation(mini_title_change_animation_.Pass());
}
DataChanged(old);
@@ -550,7 +549,7 @@ void Tab::StartPulse() {
}
void Tab::StopPulse() {
- StopAndDeleteAnimation(pulse_animation_.PassAs<gfx::Animation>());
+ StopAndDeleteAnimation(pulse_animation_.Pass());
}
void Tab::StartMiniTabTitleAnimation() {
@@ -582,7 +581,7 @@ void Tab::StartMiniTabTitleAnimation() {
}
void Tab::StopMiniTabTitleAnimation() {
- StopAndDeleteAnimation(mini_title_change_animation_.PassAs<gfx::Animation>());
+ StopAndDeleteAnimation(mini_title_change_animation_.Pass());
}
// static
« no previous file with comments | « chrome/browser/ui/views/settings_api_bubble_helper_views.cc ('k') | chrome/browser/ui/webui/policy_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698