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

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller_private.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/browser_window_controller_private.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index 39c04b0b92aa1ed9d5de73d52479a32fddbf82f3..bd9cb661cb60f875bd34e0e872d774ae0b50bb70 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -7,7 +7,7 @@
#include <cmath>
#include "base/command_line.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
#include "base/prefs/pref_service.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ -552,21 +552,22 @@ willPositionSheet:(NSWindow*)sheet
[bookmarkBubbleController_ ok:self];
// Save the current first responder so we can restore after views are moved.
- scoped_nsobject<FocusTracker> focusTracker(
+ base::scoped_nsobject<FocusTracker> focusTracker(
[[FocusTracker alloc] initWithWindow:sourceWindow]);
// While we move views (and focus) around, disable any bar visibility changes.
[self disableBarVisibilityUpdates];
// Retain the tab strip view while we remove it from its superview.
- scoped_nsobject<NSView> tabStripView;
+ base::scoped_nsobject<NSView> tabStripView;
if ([self hasTabStrip]) {
tabStripView.reset([[self tabStripView] retain]);
[tabStripView removeFromSuperview];
}
// Ditto for the content view.
- scoped_nsobject<NSView> contentView([[sourceWindow contentView] retain]);
+ base::scoped_nsobject<NSView> contentView(
+ [[sourceWindow contentView] retain]);
// Disable autoresizing of subviews while we move views around. This prevents
// spurious renderer resizes.
[contentView setAutoresizesSubviews:NO];

Powered by Google App Engine
This is Rietveld 408576698