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

Unified Diff: chrome/browser/ui/cocoa/web_dialog_window_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/web_dialog_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
index 9797deb43736c10dd3545631b0f93c9e85ed70ff..4460de952d3141f5ac32e000dda0879c3f9b7d9b 100644
--- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
+++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
@@ -5,7 +5,7 @@
#import "chrome/browser/ui/cocoa/web_dialog_window_controller.h"
#include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#import "chrome/browser/ui/browser_dialogs.h"
#import "chrome/browser/ui/cocoa/browser_command_executor.h"
@@ -317,12 +317,12 @@ void WebDialogWindowDelegateBridge::HandleKeyboardEvent(
NSRect dialogRect = NSMakeRect(0, 0, dialogSize.width(), dialogSize.height());
NSUInteger style = NSTitledWindowMask | NSClosableWindowMask |
NSResizableWindowMask;
- scoped_nsobject<ChromeEventProcessingWindow> window(
+ base::scoped_nsobject<ChromeEventProcessingWindow> window(
[[ChromeEventProcessingWindow alloc]
- initWithContentRect:dialogRect
- styleMask:style
- backing:NSBackingStoreBuffered
- defer:YES]);
+ initWithContentRect:dialogRect
+ styleMask:style
+ backing:NSBackingStoreBuffered
+ defer:YES]);
if (!window.get()) {
return nil;
}

Powered by Google App Engine
This is Rietveld 408576698