Fixing signage of the chromeMask flag, and putting an unused function inside the QUICKTIME_THROBBER #ifdef

camino/BrowserWindowController.h

@@ -134,7 +134,7 @@ class nsIDOMNode;
                                        // be returned to its original position when the drawer closes.
   NSRect mCachedFrameAfterDrawerOpen;
 
-  int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars)
+  unsigned int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars)
 
   // Context menu members.
   int mContextMenuFlags;
@@ -215,7 +215,8 @@ class nsIDOMNode;
 -(void)autosaveWindowFrame;
 -(void)disableAutosave;
 
--(void)setChromeMask:(int)aMask;
+-(void)setChromeMask:(unsigned int)aMask;
+-(unsigned int)chromeMask;
 
 -(id)getAddBookmarkSheetWindow;
 -(id)getAddBookmarkTitle;

camino/BrowserWindowController.mm

@@ -1031,11 +1031,16 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
     [mSidebarTabView selectFirstTabViewItem:self];
 }
 
--(void)setChromeMask:(int)aMask
+-(void)setChromeMask:(unsigned int)aMask
 {
   mChromeMask = aMask;
 }
 
+-(unsigned int)chromeMask
+{
+  return mChromeMask;
+}
+
 -(void) biggerTextSize
 {
   nsCOMPtr<nsIDOMWindow> contentWindow = getter_AddRefs([[mBrowserView getBrowserView] getContentWindow]);
@@ -1351,7 +1356,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
   [toolbarItem setImage: [mImages objectAtIndex: mFrame]];
 }
 
+#define QUICKTIME_THROBBER 0
 
+#if QUICKTIME_THROBBER
 static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon)
 {
     if (action == mcActionMovieClick || action == mcActionMouseDown) {
@@ -1361,8 +1368,7 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par
     }
     return false;
 }
-
-#define QUICKTIME_THROBBER 0
+#endif
 
 - (void)startThrobber
 {

camino/src/browser/BrowserWindowController.h

@@ -134,7 +134,7 @@ class nsIDOMNode;
                                        // be returned to its original position when the drawer closes.
   NSRect mCachedFrameAfterDrawerOpen;
 
-  int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars)
+  unsigned int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars)
 
   // Context menu members.
   int mContextMenuFlags;
@@ -215,7 +215,8 @@ class nsIDOMNode;
 -(void)autosaveWindowFrame;
 -(void)disableAutosave;
 
--(void)setChromeMask:(int)aMask;
+-(void)setChromeMask:(unsigned int)aMask;
+-(unsigned int)chromeMask;
 
 -(id)getAddBookmarkSheetWindow;
 -(id)getAddBookmarkTitle;

camino/src/browser/BrowserWindowController.mm

@@ -1031,11 +1031,16 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
     [mSidebarTabView selectFirstTabViewItem:self];
 }
 
--(void)setChromeMask:(int)aMask
+-(void)setChromeMask:(unsigned int)aMask
 {
   mChromeMask = aMask;
 }
 
+-(unsigned int)chromeMask
+{
+  return mChromeMask;
+}
+
 -(void) biggerTextSize
 {
   nsCOMPtr<nsIDOMWindow> contentWindow = getter_AddRefs([[mBrowserView getBrowserView] getContentWindow]);
@@ -1351,7 +1356,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
   [toolbarItem setImage: [mImages objectAtIndex: mFrame]];
 }
 
+#define QUICKTIME_THROBBER 0
 
+#if QUICKTIME_THROBBER
 static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon)
 {
     if (action == mcActionMovieClick || action == mcActionMouseDown) {
@@ -1361,8 +1368,7 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par
     }
     return false;
 }
-
-#define QUICKTIME_THROBBER 0
+#endif
 
 - (void)startThrobber
 {

chimera/BrowserWindowController.h

@@ -134,7 +134,7 @@ class nsIDOMNode;
                                        // be returned to its original position when the drawer closes.
   NSRect mCachedFrameAfterDrawerOpen;
 
-  int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars)
+  unsigned int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars)
 
   // Context menu members.
   int mContextMenuFlags;
@@ -215,7 +215,8 @@ class nsIDOMNode;
 -(void)autosaveWindowFrame;
 -(void)disableAutosave;
 
--(void)setChromeMask:(int)aMask;
+-(void)setChromeMask:(unsigned int)aMask;
+-(unsigned int)chromeMask;
 
 -(id)getAddBookmarkSheetWindow;
 -(id)getAddBookmarkTitle;

chimera/BrowserWindowController.mm

@@ -1031,11 +1031,16 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
     [mSidebarTabView selectFirstTabViewItem:self];
 }
 
--(void)setChromeMask:(int)aMask
+-(void)setChromeMask:(unsigned int)aMask
 {
   mChromeMask = aMask;
 }
 
+-(unsigned int)chromeMask
+{
+  return mChromeMask;
+}
+
 -(void) biggerTextSize
 {
   nsCOMPtr<nsIDOMWindow> contentWindow = getter_AddRefs([[mBrowserView getBrowserView] getContentWindow]);
@@ -1351,7 +1356,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
   [toolbarItem setImage: [mImages objectAtIndex: mFrame]];
 }
 
+#define QUICKTIME_THROBBER 0
 
+#if QUICKTIME_THROBBER
 static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon)
 {
     if (action == mcActionMovieClick || action == mcActionMouseDown) {
@@ -1361,8 +1368,7 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par
     }
     return false;
 }
-
-#define QUICKTIME_THROBBER 0
+#endif
 
 - (void)startThrobber
 {

chimera/src/browser/BrowserWindowController.h

@@ -134,7 +134,7 @@ class nsIDOMNode;
                                        // be returned to its original position when the drawer closes.
   NSRect mCachedFrameAfterDrawerOpen;
 
-  int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars)
+  unsigned int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars)
 
   // Context menu members.
   int mContextMenuFlags;
@@ -215,7 +215,8 @@ class nsIDOMNode;
 -(void)autosaveWindowFrame;
 -(void)disableAutosave;
 
--(void)setChromeMask:(int)aMask;
+-(void)setChromeMask:(unsigned int)aMask;
+-(unsigned int)chromeMask;
 
 -(id)getAddBookmarkSheetWindow;
 -(id)getAddBookmarkTitle;

chimera/src/browser/BrowserWindowController.mm

@@ -1031,11 +1031,16 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
     [mSidebarTabView selectFirstTabViewItem:self];
 }
 
--(void)setChromeMask:(int)aMask
+-(void)setChromeMask:(unsigned int)aMask
 {
   mChromeMask = aMask;
 }
 
+-(unsigned int)chromeMask
+{
+  return mChromeMask;
+}
+
 -(void) biggerTextSize
 {
   nsCOMPtr<nsIDOMWindow> contentWindow = getter_AddRefs([[mBrowserView getBrowserView] getContentWindow]);
@@ -1351,7 +1356,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
   [toolbarItem setImage: [mImages objectAtIndex: mFrame]];
 }
 
+#define QUICKTIME_THROBBER 0
 
+#if QUICKTIME_THROBBER
 static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon)
 {
     if (action == mcActionMovieClick || action == mcActionMouseDown) {
@@ -1361,8 +1368,7 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par
     }
     return false;
 }
-
-#define QUICKTIME_THROBBER 0
+#endif
 
 - (void)startThrobber
 {