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

Unified Diff: content/shell/shell_mac.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: content/shell/shell_mac.mm
diff --git a/content/shell/shell_mac.mm b/content/shell/shell_mac.mm
index be921309373827c9266d2aba9f966981f6d7a560..7bb3b30c6ab5bdf192420537fa1b3b68d4d62730 100644
--- a/content/shell/shell_mac.mm
+++ b/content/shell/shell_mac.mm
@@ -7,7 +7,7 @@
#include <algorithm>
#include "base/logging.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
#include "base/strings/string_piece.h"
#include "base/strings/sys_string_conversions.h"
#include "content/public/browser/native_web_keyboard_event.h"
@@ -106,7 +106,8 @@ void MakeShellButton(NSRect* rect,
NSView* target,
NSString* key,
NSUInteger modifier) {
- scoped_nsobject<NSButton> button([[NSButton alloc] initWithFrame:*rect]);
+ base::scoped_nsobject<NSButton> button(
+ [[NSButton alloc] initWithFrame:*rect]);
[button setTitle:title];
[button setBezelStyle:NSSmallSquareBezelStyle];
[button setAutoresizingMask:(NSViewMaxXMargin | NSViewMinYMargin)];
@@ -222,7 +223,7 @@ void Shell::PlatformCreateWindow(int width, int height) {
button_frame.size.width =
NSWidth(initial_window_bounds) - NSMinX(button_frame);
- scoped_nsobject<NSTextField> url_edit_view(
+ base::scoped_nsobject<NSTextField> url_edit_view(
[[NSTextField alloc] initWithFrame:button_frame]);
[content addSubview:url_edit_view];
[url_edit_view setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];

Powered by Google App Engine
This is Rietveld 408576698