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

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

Issue 18346006: Update OS X to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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/cocoa/tabpose_window_unittest.mm ('k') | cloud_print/gcp20/prototype/dns_sd_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 1fc0c839c247963c01d19f9e04cfa1a45e97bb3c..b7f1c9db394e835b80a45ad4d665a9814fc8bc4d 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -1636,7 +1636,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {
projectorImage:projector
throbImage:projectorGlow
durationMS:kRecordingDurationMs
- animationContainer:animationContainer_] autorelease];
+ animationContainer:animationContainer_.get()] autorelease];
iconView = projectingView;
} else if (theme && chrome::ShouldShowRecordingIndicator(contents)) {
@@ -1655,7 +1655,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {
throbImage:recording
durationMS:kRecordingDurationMs
throbPosition:kThrobPositionBottomRight
- animationContainer:animationContainer_] autorelease];
+ animationContainer:animationContainer_.get()] autorelease];
iconView = recordingView;
} else if (chrome::IsPlayingAudio(contents) ||
@@ -1666,7 +1666,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {
tabAudioIndicatorViewMac = [[[TabAudioIndicatorViewMac alloc]
initWithFrame:frame] autorelease];
[tabAudioIndicatorViewMac
- setAnimationContainer:animationContainer_];
+ setAnimationContainer:animationContainer_.get()];
}
[tabAudioIndicatorViewMac
setIsPlayingAudio:chrome::IsPlayingAudio(contents)];
« no previous file with comments | « chrome/browser/ui/cocoa/tabpose_window_unittest.mm ('k') | cloud_print/gcp20/prototype/dns_sd_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698