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

Unified Diff: chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.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/javascript_app_modal_dialog_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
index 5e8b6e3652a1c3096f393985af7b8f4f1d9c0437..a903723bdb248d28aca6c6d794fefffaffb09cfe 100644
--- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
@@ -21,7 +21,7 @@
// going away. Is responsible for cleaning itself up.
@interface JavaScriptAppModalDialogHelper : NSObject<NSAlertDelegate> {
@private
- scoped_nsobject<NSAlert> alert_;
+ base::scoped_nsobject<NSAlert> alert_;
NSTextField* textField_; // WEAK; owned by alert_
}
@@ -208,13 +208,13 @@ JavaScriptAppModalDialogCocoa::JavaScriptAppModalDialogCocoa(
}
if (message_has_rtl && message_text_field) {
- scoped_nsobject<NSMutableParagraphStyle> alignment(
+ base::scoped_nsobject<NSMutableParagraphStyle> alignment(
[[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
[alignment setAlignment:NSRightTextAlignment];
NSDictionary* alignment_attributes =
@{ NSParagraphStyleAttributeName : alignment };
- scoped_nsobject<NSAttributedString> attr_string(
+ base::scoped_nsobject<NSAttributedString> attr_string(
[[NSAttributedString alloc] initWithString:message_text
attributes:alignment_attributes]);
@@ -225,7 +225,7 @@ JavaScriptAppModalDialogCocoa::JavaScriptAppModalDialogCocoa(
if (informative_has_rtl && informative_text_field) {
base::i18n::TextDirection direction =
base::i18n::GetFirstStrongCharacterDirection(dialog_->message_text());
- scoped_nsobject<NSMutableParagraphStyle> alignment(
+ base::scoped_nsobject<NSMutableParagraphStyle> alignment(
[[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
[alignment setAlignment:
(direction == base::i18n::RIGHT_TO_LEFT) ? NSRightTextAlignment
@@ -233,7 +233,7 @@ JavaScriptAppModalDialogCocoa::JavaScriptAppModalDialogCocoa(
NSDictionary* alignment_attributes =
@{ NSParagraphStyleAttributeName : alignment };
- scoped_nsobject<NSAttributedString> attr_string(
+ base::scoped_nsobject<NSAttributedString> attr_string(
[[NSAttributedString alloc] initWithString:informative_text
attributes:alignment_attributes]);

Powered by Google App Engine
This is Rietveld 408576698