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

Unified Diff: chrome/browser/ui/cocoa/confirm_quit_panel_controller.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm
diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm
index 659fff86f0a27fea42d94b33e933c8a2be7ad5bc..27813eb0dcb0a2e6b742de77e8fd4ed18e58d7a6 100644
--- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm
+++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm
@@ -8,7 +8,7 @@
#import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h"
#include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/metrics/histogram.h"
#include "base/prefs/pref_registry_simple.h"
#include "base/strings/sys_string_conversions.h"
@@ -65,7 +65,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
- (id)initWithFrame:(NSRect)frameRect {
if ((self = [super initWithFrame:frameRect])) {
- scoped_nsobject<NSTextField> message(
+ base::scoped_nsobject<NSTextField> message(
// The frame will be fixed up when |-setMessageText:| is called.
[[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 0, 0)]);
message_ = message.get();
@@ -95,9 +95,9 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
const CGFloat kHorizontalPadding = 30; // In view coordinates.
// Style the string.
- scoped_nsobject<NSMutableAttributedString> attrString(
+ base::scoped_nsobject<NSMutableAttributedString> attrString(
[[NSMutableAttributedString alloc] initWithString:text]);
- scoped_nsobject<NSShadow> textShadow([[NSShadow alloc] init]);
+ base::scoped_nsobject<NSShadow> textShadow([[NSShadow alloc] init]);
[textShadow.get() setShadowColor:[NSColor colorWithCalibratedWhite:0
alpha:0.6]];
[textShadow.get() setShadowOffset:NSMakeSize(0, -1)];
@@ -192,7 +192,7 @@ ConfirmQuitPanelController* g_confirmQuitPanelController = nil;
- (id)init {
const NSRect kWindowFrame = NSMakeRect(0, 0, 350, 70);
- scoped_nsobject<NSWindow> window(
+ base::scoped_nsobject<NSWindow> window(
[[NSWindow alloc] initWithContentRect:kWindowFrame
styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered
@@ -205,7 +205,7 @@ ConfirmQuitPanelController* g_confirmQuitPanelController = nil;
// Create the content view. Take the frame from the existing content view.
NSRect frame = [[window contentView] frame];
- scoped_nsobject<ConfirmQuitFrameView> frameView(
+ base::scoped_nsobject<ConfirmQuitFrameView> frameView(
[[ConfirmQuitFrameView alloc] initWithFrame:frame]);
contentView_ = frameView.get();
[window setContentView:contentView_];
@@ -230,7 +230,7 @@ ConfirmQuitPanelController* g_confirmQuitPanelController = nil;
}
- (NSApplicationTerminateReply)runModalLoopForApplication:(NSApplication*)app {
- scoped_nsobject<ConfirmQuitPanelController> keepAlive([self retain]);
+ base::scoped_nsobject<ConfirmQuitPanelController> keepAlive([self retain]);
// If this is the second of two such attempts to quit within a certain time
// interval, then just quit.
@@ -327,7 +327,7 @@ ConfirmQuitPanelController* g_confirmQuitPanelController = nil;
- (void)showWindow:(id)sender {
// If a panel that is fading out is going to be reused here, make sure it
// does not get released when the animation finishes.
- scoped_nsobject<ConfirmQuitPanelController> keepAlive([self retain]);
+ base::scoped_nsobject<ConfirmQuitPanelController> keepAlive([self retain]);
[[self window] setAnimations:[NSDictionary dictionary]];
[[self window] center];
[[self window] setAlphaValue:1.0];
@@ -342,7 +342,7 @@ ConfirmQuitPanelController* g_confirmQuitPanelController = nil;
- (void)animateFadeOut {
NSWindow* window = [self window];
- scoped_nsobject<CAAnimation> animation(
+ base::scoped_nsobject<CAAnimation> animation(
[[window animationForKey:@"alphaValue"] copy]);
[animation setDelegate:self];
[animation setDuration:0.2];

Powered by Google App Engine
This is Rietveld 408576698