Convert //content ObjC Instance Variable Names From Trailing to Leading Underscore
Clang-Tidy performed all of the transformations in this change.
BUG=1030028
[email protected]
Associated mechanical changes to header files.
Change-Id: I5453a6602efec4f4d26fc0fe88a9691dbdcf26de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1961088
Reviewed-by: Robert Liao <[email protected]>
Reviewed-by: Elly Fong-Jones <[email protected]>
Commit-Queue: Robert Liao <[email protected]>
Cr-Commit-Position: refs/heads/master@{#723845}
diff --git a/content/shell/browser/shell_javascript_dialog_mac.mm b/content/shell/browser/shell_javascript_dialog_mac.mm
index d77829d..e323eb5 100644
--- a/content/shell/browser/shell_javascript_dialog_mac.mm
+++ b/content/shell/browser/shell_javascript_dialog_mac.mm
@@ -14,12 +14,12 @@
// going away. Is responsible for cleaning itself up.
@interface ShellJavaScriptDialogHelper : NSObject<NSAlertDelegate> {
@private
- base::scoped_nsobject<NSAlert> alert_;
- NSTextField* textField_; // WEAK; owned by alert_
+ base::scoped_nsobject<NSAlert> _alert;
+ NSTextField* _textField; // WEAK; owned by alert_
// Copies of the fields in ShellJavaScriptDialog because they're private.
- content::ShellJavaScriptDialogManager* manager_;
- content::JavaScriptDialogManager::DialogClosedCallback callback_;
+ content::ShellJavaScriptDialogManager* _manager;
+ content::JavaScriptDialogManager::DialogClosedCallback _callback;
}
- (id)initHelperWithManager:(content::ShellJavaScriptDialogManager*)manager
@@ -37,26 +37,26 @@
- (id)initHelperWithManager:(content::ShellJavaScriptDialogManager*)manager
andCallback:(content::JavaScriptDialogManager::DialogClosedCallback)callback {
if (self = [super init]) {
- manager_ = manager;
- callback_ = std::move(callback);
+ _manager = manager;
+ _callback = std::move(callback);
}
return self;
}
- (NSAlert*)alert {
- alert_.reset([[NSAlert alloc] init]);
- return alert_;
+ _alert.reset([[NSAlert alloc] init]);
+ return _alert;
}
- (NSTextField*)textField {
- textField_ = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 300, 22)];
- [[textField_ cell] setLineBreakMode:NSLineBreakByTruncatingTail];
- [alert_ setAccessoryView:textField_];
- [[alert_ window] setInitialFirstResponder:textField_];
- [textField_ release];
+ _textField = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 300, 22)];
+ [[_textField cell] setLineBreakMode:NSLineBreakByTruncatingTail];
+ [_alert setAccessoryView:_textField];
+ [[_alert window] setInitialFirstResponder:_textField];
+ [_textField release];
- return textField_;
+ return _textField;
}
- (void)alertDidEndWithResult:(NSModalResponse)returnCode
@@ -66,16 +66,16 @@
bool success = returnCode == NSAlertFirstButtonReturn;
base::string16 input;
- if (textField_)
- input = base::SysNSStringToUTF16([textField_ stringValue]);
+ if (_textField)
+ input = base::SysNSStringToUTF16([_textField stringValue]);
- std::move(callback_).Run(success, input);
- manager_->DialogClosed(dialog);
+ std::move(_callback).Run(success, input);
+ _manager->DialogClosed(dialog);
}
- (void)cancel {
- [NSApp endSheet:[alert_ window]];
- alert_.reset();
+ [NSApp endSheet:[_alert window]];
+ _alert.reset();
}
@end
