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

Unified Diff: chrome/browser/cocoa/autocomplete_text_field_editor.mm

Issue 1550002: -[AutocompleteTextFieldEditor delegate] cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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
« no previous file with comments | « chrome/browser/cocoa/autocomplete_text_field_editor.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/autocomplete_text_field_editor.mm
===================================================================
--- chrome/browser/cocoa/autocomplete_text_field_editor.mm (revision 42946)
+++ chrome/browser/cocoa/autocomplete_text_field_editor.mm (working copy)
@@ -47,16 +47,23 @@
// This class assumes that the delegate is an AutocompleteTextField.
// Enforce that assumption.
-- (void)setDelegate:(id)anObject {
- DCHECK(anObject == nil ||
- [anObject isKindOfClass:[AutocompleteTextField class]]);
- [super setDelegate:anObject];
+- (AutocompleteTextField*)delegate {
+ AutocompleteTextField* delegate =
+ static_cast<AutocompleteTextField*>([super delegate]);
+ DCHECK(delegate == nil ||
+ [delegate isKindOfClass:[AutocompleteTextField class]]);
+ return delegate;
}
+- (void)setDelegate:(AutocompleteTextField*)delegate {
+ DCHECK(delegate == nil ||
+ [delegate isKindOfClass:[AutocompleteTextField class]]);
+ [super setDelegate:delegate];
+}
+
// Convenience method for retrieving the observer from the delegate.
- (AutocompleteTextFieldObserver*)observer {
- DCHECK([[self delegate] isKindOfClass:[AutocompleteTextField class]]);
- return [static_cast<AutocompleteTextField*>([self delegate]) observer];
+ return [[self delegate] observer];
}
- (void)paste:(id)sender {
@@ -145,10 +152,9 @@
// (Overridden from NSResponder)
- (BOOL)becomeFirstResponder {
BOOL doAccept = [super becomeFirstResponder];
- AutocompleteTextField* field = (AutocompleteTextField*)[self delegate];
+ AutocompleteTextField* field = [self delegate];
// Only lock visibility if we've been set up with a delegate (the text field).
if (doAccept && field) {
- DCHECK([field isKindOfClass:[AutocompleteTextField class]]);
// Give the text field ownership of the visibility lock. (The first
// responder dance between the field and the field editor is a little
// weird.)
@@ -161,10 +167,9 @@
// (Overridden from NSResponder)
- (BOOL)resignFirstResponder {
BOOL doResign = [super resignFirstResponder];
- AutocompleteTextField* field = (AutocompleteTextField*)[self delegate];
+ AutocompleteTextField* field = [self delegate];
// Only lock visibility if we've been set up with a delegate (the text field).
if (doResign && field) {
- DCHECK([field isKindOfClass:[AutocompleteTextField class]]);
// Give the text field ownership of the visibility lock.
[[BrowserWindowController browserWindowControllerForView:field]
releaseBarVisibilityForOwner:field withAnimation:YES delay:YES];
« no previous file with comments | « chrome/browser/cocoa/autocomplete_text_field_editor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698