summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 21:44:28 +0000
committermrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 21:44:28 +0000
commit58d0ea5f90c2dda5d55e6b9aa28cafe451e273eb (patch)
treede2cdab6f24f3e7cc600405f723b8c72a42ed81f
parent120118d18045730015f3c3ca4e310d97be274a75 (diff)
downloadchromium_src-58d0ea5f90c2dda5d55e6b9aa28cafe451e273eb.zip
chromium_src-58d0ea5f90c2dda5d55e6b9aa28cafe451e273eb.tar.gz
chromium_src-58d0ea5f90c2dda5d55e6b9aa28cafe451e273eb.tar.bz2
Address clang complaint about possible unrecognized function call.
BUG=None TEST=None TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/6142012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71084 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm6
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h
index 683c5ca..e78a968 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h
@@ -200,7 +200,7 @@
- (BOOL)canScrollDown;
- (CGFloat)verticalScrollArrowHeight;
- (NSView*)visibleView;
-- (NSView*)scrollView;
+- (NSScrollView*)scrollView;
- (NSView*)folderView;
- (BookmarkButton*)buttonForDroppingOnAtPoint:(NSPoint)point;
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
index a939207..3221b3e 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
@@ -1662,7 +1662,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
return visibleView_;
}
-- (NSView*)scrollView {
+- (NSScrollView*)scrollView {
return scrollView_;
}
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
index 28f46de..e7fdd2c 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
@@ -470,12 +470,12 @@ TEST_F(BookmarkBarFolderControllerTest, SimpleScroll) {
// Also, for each scroll, make sure our hit test finds a new button
// (to confirm the content area changed).
NSView* savedHit = nil;
- NSView* scrollView = [bbfc scrollView];
+ NSScrollView* scrollView = [bbfc scrollView];
// Find the next-to-last button showing at the bottom of the window and
// us its center for hit testing.
BookmarkButton* targetButton = nil;
- NSPoint scrollPoint = [[bbfc scrollView] documentVisibleRect].origin;
+ NSPoint scrollPoint = [scrollView documentVisibleRect].origin;
for (BookmarkButton* button in [bbfc buttons]) {
NSRect buttonFrame = [button frame];
buttonFrame.origin.y -= scrollPoint.y;
@@ -1199,7 +1199,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {
NSRect menuFrame = [folderView frame];
NSView* visibleView = [folderController visibleView];
NSRect visibleFrame = [visibleView frame];
- NSView* scrollView = [folderController scrollView];
+ NSScrollView* scrollView = [folderController scrollView];
NSRect scrollFrame = [scrollView frame];
// Determine the margins between the scroll frame and the visible frame.