chrome/browser/ui/cocoa/info_bubble_window.mm - Issue 17593006: mac: Update clients of scoped_nsobject.h.

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/ui/cocoa/info_bubble_window.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: iwyu, scoped_nsprotocol 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:

Index: chrome/browser/ui/cocoa/info_bubble_window.mm

diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm

index 4da277ae206b3547056011bb1e3e885ac818b70e..1cc17b8a7cdaec2b621992771b69ec491742d601 100644

--- a/chrome/browser/ui/cocoa/info_bubble_window.mm

+++ b/chrome/browser/ui/cocoa/info_bubble_window.mm

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

#include "base/basictypes.h"

#include "base/logging.h"

-#include "base/memory/scoped_nsobject.h"

+#include "base/mac/scoped_nsobject.h"

#include "chrome/common/chrome_notification_types.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

@@ -123,7 +123,7 @@ class AppNotificationBridge : public content::NotificationObserver {

// Notice that only the alphaValue Animation is replaced in case

// superclasses set up animations.

CAAnimation* alphaAnimation = [CABasicAnimation animation];

- scoped_nsobject<InfoBubbleWindowCloser> delegate(

+ base::scoped_nsobject<InfoBubbleWindowCloser> delegate(

[[InfoBubbleWindowCloser alloc] initWithWindow:self]);

[alphaAnimation setDelegate:delegate];

NSMutableDictionary* animations =