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

Unified Diff: chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h

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/tab_contents/sad_tab_view.h
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h
index b203cb29fbb05c101fa1d2a47b4c261e918f87d9..45fdf7e4b92d994783241ca2d1f6294c3446542a 100644
--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_H_
#define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_H_
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "ui/base/cocoa/base_view.h"
#import <Cocoa/Cocoa.h>
@@ -21,14 +21,14 @@
IBOutlet NSTextField* message_;
IBOutlet NSTextField* helpPlaceholder_;
- scoped_nsobject<NSColor> backgroundColor_;
+ base::scoped_nsobject<NSColor> backgroundColor_;
NSSize messageSize_;
// Text fields don't work as well with embedded links as text views, but
// text views cannot conveniently be created in IB. The xib file contains
// a text field |helpPlaceholder_| that's replaced by this text view |help_|
// in -awakeFromNib.
- scoped_nsobject<HyperlinkTextView> help_;
+ base::scoped_nsobject<HyperlinkTextView> help_;
// A weak reference to the parent controller.
IBOutlet SadTabController* controller_;

Powered by Google App Engine
This is Rietveld 408576698