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

Unified Diff: chrome/browser/ui/cocoa/location_bar/content_setting_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/content_setting_decoration.h
diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h
index 219992e56861cb525827b47adaeac138d88da51c..dafcd1183082e61e414b6975be62d3af3cf1db50 100644
--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h
@@ -52,7 +52,7 @@ class ContentSettingDecoration : public ImageDecoration {
void SetToolTip(NSString* tooltip);
// Returns an attributed string with the animated text.
- scoped_nsobject<NSAttributedString> CreateAnimatedText();
+ base::scoped_nsobject<NSAttributedString> CreateAnimatedText();
// Measure the width of the animated text.
CGFloat MeasureTextWidth();
@@ -62,13 +62,13 @@ class ContentSettingDecoration : public ImageDecoration {
LocationBarViewMac* owner_; // weak
Profile* profile_; // weak
- scoped_nsobject<NSString> tooltip_;
+ base::scoped_nsobject<NSString> tooltip_;
// Used when the decoration has animated text.
- scoped_nsobject<ContentSettingAnimationState> animation_;
+ base::scoped_nsobject<ContentSettingAnimationState> animation_;
CGFloat text_width_;
- scoped_nsobject<NSAttributedString> animated_text_;
- scoped_nsobject<NSGradient> gradient_;
+ base::scoped_nsobject<NSAttributedString> animated_text_;
+ base::scoped_nsobject<NSGradient> gradient_;
DISALLOW_COPY_AND_ASSIGN(ContentSettingDecoration);
};

Powered by Google App Engine
This is Rietveld 408576698