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

Unified Diff: chrome/browser/ui/cocoa/location_bar/button_decoration.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/location_bar/button_decoration.h
diff --git a/chrome/browser/ui/cocoa/location_bar/button_decoration.h b/chrome/browser/ui/cocoa/location_bar/button_decoration.h
index 70d4708cb6d966f7ff1c6b4ed2758f937adfb25a..fde8f94c19bdd5cb76bc557820c8657de4f24825 100644
--- a/chrome/browser/ui/cocoa/location_bar/button_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/button_decoration.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_BUTTON_DECORATION_H_
#define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_BUTTON_DECORATION_H_
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
#include "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
// |LocationBarDecoration| which looks and acts like a button.
@@ -42,9 +42,9 @@ class ButtonDecoration : public LocationBarDecoration {
void SetPressedImage(NSImage* pressed_image);
private:
- scoped_nsobject<NSImage> normal_image_;
- scoped_nsobject<NSImage> hover_image_;
- scoped_nsobject<NSImage> pressed_image_;
+ base::scoped_nsobject<NSImage> normal_image_;
+ base::scoped_nsobject<NSImage> hover_image_;
+ base::scoped_nsobject<NSImage> pressed_image_;
ButtonState state_;
NSImage* GetImage();

Powered by Google App Engine
This is Rietveld 408576698