summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-12 22:10:29 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-12 22:10:29 +0000
commite5518c46e8e6bcd6eb23682655b77db823e3ae92 (patch)
treebde78f41bf005ad25f7830e192160a3cf279db26
parent02cf5a4cb28d86669bcc4c3934f51437795b05ac (diff)
downloadchromium_src-e5518c46e8e6bcd6eb23682655b77db823e3ae92.zip
chromium_src-e5518c46e8e6bcd6eb23682655b77db823e3ae92.tar.gz
chromium_src-e5518c46e8e6bcd6eb23682655b77db823e3ae92.tar.bz2
Cocoa bookmarks manager and autocomplete text field editor: in the 10.6 SDK,
delegates implement protocols, and -delegate methods no longer return type |id|. Add casts as needed. BUG=none TEST=10.6 SDK build Review URL: http://codereview.chromium.org/550022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36055 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/cocoa/autocomplete_text_field_editor.mm5
-rw-r--r--chrome/browser/cocoa/bookmark_groups_controller.mm2
-rw-r--r--chrome/browser/cocoa/bookmark_tree_controller.mm2
3 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/autocomplete_text_field_editor.mm b/chrome/browser/cocoa/autocomplete_text_field_editor.mm
index cf6e77b..0973418 100644
--- a/chrome/browser/cocoa/autocomplete_text_field_editor.mm
+++ b/chrome/browser/cocoa/autocomplete_text_field_editor.mm
@@ -99,8 +99,9 @@ class Extension;
NSPoint location = [self convertPoint:[event locationInWindow] fromView:nil];
// Was the right click within a Page Action? Show a different menu if so.
- NSRect bounds([[self delegate] bounds]);
- AutocompleteTextFieldCell* cell = [[self delegate] autocompleteTextFieldCell];
+ AutocompleteTextField* field = (AutocompleteTextField*)[self delegate];
+ NSRect bounds([field bounds]);
+ AutocompleteTextFieldCell* cell = [field autocompleteTextFieldCell];
const size_t pageActionCount = [cell pageActionCount];
BOOL flipped = [self isFlipped];
Browser* browser = BrowserList::GetLastActive();
diff --git a/chrome/browser/cocoa/bookmark_groups_controller.mm b/chrome/browser/cocoa/bookmark_groups_controller.mm
index e82b847..ab108f9 100644
--- a/chrome/browser/cocoa/bookmark_groups_controller.mm
+++ b/chrome/browser/cocoa/bookmark_groups_controller.mm
@@ -290,7 +290,7 @@
}
- (NSMenu*)menu {
- return [[self delegate] menu];
+ return [(BookmarkGroupsController*)[self delegate] menu];
}
@end
diff --git a/chrome/browser/cocoa/bookmark_tree_controller.mm b/chrome/browser/cocoa/bookmark_tree_controller.mm
index accf698..07b967e 100644
--- a/chrome/browser/cocoa/bookmark_tree_controller.mm
+++ b/chrome/browser/cocoa/bookmark_tree_controller.mm
@@ -357,7 +357,7 @@
}
- (NSMenu*)menu {
- return [[self delegate] menu];
+ return [(BookmarkTreeController*)[self delegate] menu];
}
@end