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

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_decoration.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/location_bar/location_bar_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm
index 37cbb8432ccda92bb471dcb685b2732a3d1814e7..13ff083be944cacdfb6c7960d5811423e79a2fcc 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm
@@ -5,7 +5,7 @@
#import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
#include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
const CGFloat LocationBarDecoration::kOmittedWidth = 0.0;
@@ -75,7 +75,7 @@ NSFont* LocationBarDecoration::GetFont() const {
void LocationBarDecoration::DrawLabel(NSString* label,
NSDictionary* attributes,
const NSRect& frame) {
- scoped_nsobject<NSAttributedString> str(
+ base::scoped_nsobject<NSAttributedString> str(
[[NSAttributedString alloc] initWithString:label attributes:attributes]);
DrawAttributedString(str, frame);
}

Powered by Google App Engine
This is Rietveld 408576698