Fix a bunch of clang warnings/errors.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/3473006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60109 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 6 deletions

diff --git a/chrome/browser/cocoa/applescript/bookmark_folder_applescript.h b/chrome/browser/cocoa/applescript/bookmark_folder_applescript.h
index c8969de..f56a3f9 100644
--- a/chrome/browser/cocoa/applescript/bookmark_folder_applescript.h
+++ b/chrome/browser/cocoa/applescript/bookmark_folder_applescript.h
@@ -9,6 +9,8 @@
 
 #import "chrome/browser/cocoa/applescript/bookmark_node_applescript.h"
 
+@class BookmarkItemAppleScript;
+
 // Represent a bookmark folder scriptable object in applescript.
 @interface BookmarkFolderAppleScript : BookmarkNodeAppleScript {
 
@@ -38,12 +40,13 @@
 - (NSArray*)bookmarkItems;
 
 // Inserts a bookmark item at the end.
-- (void)insertInBookmarkItems:(id)aBookmarkItem;
+- (void)insertInBookmarkItems:(BookmarkItemAppleScript*)aBookmarkItem;
 
 // Inserts a bookmark item at some position in the list.
 // Called by applescript which takes care of bounds checking, make sure of it
 // before calling directly.
-- (void)insertInBookmarkItems:(id)aBookmarkItem atIndex:(int)index;
+- (void)insertInBookmarkItems:(BookmarkItemAppleScript*)aBookmarkItem
+                      atIndex:(int)index;
 
 // Removes a bookmarks folder from the list.
 // Called by applescript which takes care of bounds checking, make sure of it
diff --git a/chrome/browser/cocoa/sidebar_controller.mm b/chrome/browser/cocoa/sidebar_controller.mm
index c5a0081..b78570e 100644
--- a/chrome/browser/cocoa/sidebar_controller.mm
+++ b/chrome/browser/cocoa/sidebar_controller.mm
@@ -53,7 +53,7 @@ const int kMinWebWidth = 50;
   [super dealloc];
 }
 
-- (NSView*)view {
+- (NSSplitView*)view {
   return splitView_.get();
 }
 
diff --git a/chrome/browser/cocoa/tabpose_window.h b/chrome/browser/cocoa/tabpose_window.h
index 39958a2..fef3bbb 100644
--- a/chrome/browser/cocoa/tabpose_window.h
+++ b/chrome/browser/cocoa/tabpose_window.h
@@ -59,10 +59,10 @@ class TabStripModelObserverBridge;
 
   // Stores all preview layers. The order in here matches the order in
   // the tabstrip model.
-  scoped_nsobject<NSArray> allThumbnailLayers_;
+  scoped_nsobject<NSMutableArray> allThumbnailLayers_;
 
-  scoped_nsobject<NSArray> allFaviconLayers_;
-  scoped_nsobject<NSArray> allTitleLayers_;
+  scoped_nsobject<NSMutableArray> allFaviconLayers_;
+  scoped_nsobject<NSMutableArray> allTitleLayers_;
 
   // Manages the state of all layers.
   scoped_ptr<tabpose::TileSet> tileSet_;