Fixing bug 356351, Clean up MainController.mm. Patch by smorgan <stuart.morgan@alumni.case.edu>. r=stridey, sr=pink. Camino trunk only.

camino/src/application/MainController.h

@@ -62,11 +62,11 @@ typedef enum EBookmarkOpenBehavior
 @interface MainController : NSObject 
 {
     IBOutlet NSApplication* mApplication;
-    
+
     // The following item is added to NSSavePanels as an accessory view
     IBOutlet NSView*        mFilterView;
     IBOutlet NSView*        mExportPanelView;
-    
+
     // IBOutlet NSMenuItem*    mOfflineMenuItem;
     IBOutlet NSMenuItem*    mCloseWindowMenuItem;
     IBOutlet NSMenuItem*    mCloseTabMenuItem;
@@ -88,7 +88,7 @@ typedef enum EBookmarkOpenBehavior
     IBOutlet NSMenuItem*    mCreateBookmarksFolderMenuItem;
     IBOutlet NSMenuItem*    mCreateBookmarksSeparatorMenuItem;  // unused
     IBOutlet NSMenuItem*    mShowAllBookmarksMenuItem;
-    
+
     BOOL                    mOffline;
     BOOL                    mGeckoInitted;
     BOOL                    mBookmarksMenuUpdatePending;
@@ -97,122 +97,112 @@ typedef enum EBookmarkOpenBehavior
 
     BookmarkMenu*           mMenuBookmarks;
     BookmarkMenu*           mDockBookmarks;
-    
+
     KeychainService*        mKeychainService;
 
     FindDlgController*      mFindDialog;
 
     NSString*               mStartURL;
-    
+
     SharedMenusObj*         mSharedMenusObj;
     NSMutableDictionary*    mCharsets;
 }
 
--(IBAction)aboutWindow:(id)sender;
--(IBAction) feedbackLink:(id)aSender;
+// Application menu actions
+- (IBAction)aboutWindow:(id)sender;
+- (IBAction)feedbackLink:(id)aSender;
+- (IBAction)displayPreferencesWindow:(id)sender;
+- (IBAction)resetBrowser:(id)sender;
+- (IBAction)emptyCache:(id)sender;
 
-// File menu actions.
--(IBAction) newWindow:(id)aSender;
--(IBAction) newTab:(id)aSender;
--(IBAction) closeAllWindows:(id)aSender;
--(IBAction) closeTab:(id)aSender;
--(IBAction) openFile:(id)aSender;
--(IBAction) openLocation:(id)aSender;
--(IBAction) savePage:(id)aSender;
--(IBAction) pageSetup:(id)aSender;
--(IBAction) printPage:(id)aSender;
--(IBAction) toggleOfflineMode:(id)aSender;
--(IBAction) sendURL:(id)aSender;
+// File menu actions
+- (IBAction)newWindow:(id)aSender;
+- (IBAction)newTab:(id)aSender;
+- (IBAction)openFile:(id)aSender;
+- (IBAction)openLocation:(id)aSender;
+- (IBAction)doSearch:(id)aSender;
+- (IBAction)closeAllWindows:(id)aSender;
+- (IBAction)closeTab:(id)aSender;
+- (IBAction)savePage:(id)aSender;
+- (IBAction)sendURL:(id)aSender;
+- (IBAction)importBookmarks:(id)aSender;
+- (IBAction)exportBookmarks:(id)aSender;
+- (IBAction)pageSetup:(id)aSender;
+- (IBAction)printPage:(id)aSender;
+- (IBAction)toggleOfflineMode:(id)aSender; // unused
 
-// Edit menu actions.
--(IBAction) findInPage:(id)aSender;
-
-// Go menu actions.
--(IBAction) goBack:(id)aSender;
--(IBAction) goForward:(id)aSender;
--(IBAction) goHome:(id)aSender;
--(IBAction) doSearch:(id)aSender;
-
-// Local servers submenu
--(IBAction) aboutServers:(id)aSender;
--(IBAction) connectToServer:(id)aSender;
+// Edit menu actions
+- (IBAction)findInPage:(id)aSender;
 
 // View menu actions.
--(IBAction) toggleBookmarksToolbar:(id)aSender;
--(IBAction) doReload:(id)aSender;
--(IBAction) doReloadAllTabs:(id)aSender;
--(IBAction) doStop:(id)aSender;
--(IBAction) makeTextBigger:(id)aSender;
--(IBAction) makeTextSmaller:(id)aSender;
--(IBAction) makeTextDefaultSize:(id)aSender;
--(IBAction) viewSource:(id)aSender;
--(IBAction) manageBookmarks: (id)aSender;
--(IBAction) showHistory:(id)aSender;
--(IBAction) clearHistory:(id)aSender;
--(IBAction) reloadWithCharset:(id)aSender;
--(IBAction) toggleAutoCharsetDetection:(id)aSender;
+- (IBAction)toggleBookmarksToolbar:(id)aSender;
+- (IBAction)doStop:(id)aSender;
+- (IBAction)doReload:(id)aSender;
+- (IBAction)doReloadAllTabs:(id)aSender;
+- (IBAction)makeTextBigger:(id)aSender;
+- (IBAction)makeTextDefaultSize:(id)aSender;
+- (IBAction)makeTextSmaller:(id)aSender;
+- (IBAction)viewSource:(id)aSender;
+- (IBAction)reloadWithCharset:(id)aSender;
+- (IBAction)toggleAutoCharsetDetection:(id)aSender;
 
-// Bookmarks menu actions.
--(IBAction) importBookmarks:(id)aSender;
--(IBAction) exportBookmarks:(id)aSender;
+// History menu actions
+- (IBAction)goHome:(id)aSender;
+- (IBAction)goBack:(id)aSender;
+- (IBAction)goForward:(id)aSender;
+- (IBAction)showHistory:(id)aSender;
+- (IBAction)clearHistory:(id)aSender;
 
--(IBAction) openMenuBookmark:(id)aSender;
+// Bookmarks menu actions
+- (IBAction)manageBookmarks: (id)aSender;
+- (IBAction)openMenuBookmark:(id)aSender;
+
+// Bonjour submenu
+- (IBAction)aboutServers:(id)aSender;
+- (IBAction)connectToServer:(id)aSender;
 
 // Window menu actions
--(IBAction) zoomAll:(id)aSender;
--(IBAction) previousTab:(id)aSender;
--(IBAction) nextTab:(id)aSender;
--(IBAction) downloadsWindow:(id)aSender;
+- (IBAction)zoomAll:(id)aSender;
+- (IBAction)previousTab:(id)aSender;
+- (IBAction)nextTab:(id)aSender;
+- (IBAction)downloadsWindow:(id)aSender;
 
 // Help menu actions
--(IBAction) supportLink:(id)aSender;
--(IBAction) infoLink:(id)aSender;
--(IBAction) releaseNoteLink:(id)aSender;
--(IBAction) tipsTricksLink:(id)aSender;
--(IBAction) searchCustomizeLink:(id)aSender;
+- (IBAction)supportLink:(id)aSender;
+- (IBAction)infoLink:(id)aSender;
+- (IBAction)aboutPlugins:(id)aSender;
+- (IBAction)releaseNoteLink:(id)aSender; // unused
+- (IBAction)tipsTricksLink:(id)aSender; // unused
+- (IBAction)searchCustomizeLink:(id)aSender; // unused
 
--(IBAction) aboutPlugins:(id)aSender;
-
--(IBAction) showCertificates:(id)aSender;
+// used by export bookmarks popup to set file extension for the resulting bookmarks file
+- (IBAction)setFileExtension:(id)aSender;
+// used by page info panel to show certificate information
+- (IBAction)showCertificates:(id)aSender;
 
 - (void)ensureGeckoInitted;
 
+// if the main/key window is a browser window, return its controller, otherwise nil
+- (BrowserWindowController*)getMainWindowBrowserController;
+- (BrowserWindowController*)getKeyWindowBrowserController;
+- (NSWindow*)getFrontmostBrowserWindow;
+- (BOOL)isMainWindowABrowserWindow;
+
 - (BrowserWindowController*)openBrowserWindowWithURL:(NSString*)aURL andReferrer:(NSString*)aReferrer behind:(NSWindow*)window allowPopups:(BOOL)inAllowPopups;
 - (BrowserWindowController*)openBrowserWindowWithURLs:(NSArray*)urlArray behind:(NSWindow*)window allowPopups:(BOOL)inAllowPopups;
-
 - (void)openNewWindowOrTabWithURL:(NSString*)inURLString andReferrer:(NSString*)aReferrer alwaysInFront:(BOOL)forceFront;
+- (void)loadBookmark:(BookmarkItem*)item withBWC:(BrowserWindowController*)browserWindowController openBehavior:(EBookmarkOpenBehavior)behavior reverseBgToggle:(BOOL)reverseBackgroundPref;
 
 - (void)adjustCloseWindowMenuItemKeyEquivalent:(BOOL)inHaveTabs;
 - (void)adjustCloseTabMenuItemKeyEquivalent:(BOOL)inHaveTabs;
 - (void)delayedFixCloseMenuItemKeyEquivalents;
-
 - (void)delayedAdjustBookmarksMenuItemsEnabling;
 - (void)delayedUpdatePageInfo;
 
 - (NSView*)getSavePanelView;
-- (NSWindow*)getFrontmostBrowserWindow;
-
-- (void)loadBookmark:(BookmarkItem*)item withBWC:(BrowserWindowController*)browserWindowController openBehavior:(EBookmarkOpenBehavior)behavior reverseBgToggle:(BOOL)reverseBackgroundPref;
-- (void)displayPreferencesWindow:(id)sender;
-- (BOOL)isMainWindowABrowserWindow;
-
-// if the main window is a browser window, return its controller, otherwise nil
-- (BrowserWindowController*)getMainWindowBrowserController;
-- (BrowserWindowController*)getKeyWindowBrowserController;
 
 + (NSImage*)createImageForDragging:(NSImage*)aIcon title:(NSString*)aTitle;
-
-// used by export bookmarks popup to say what file extension should be used on the resulting
-// bookmarks file.
--(IBAction) setFileExtension:(id)aSender;
-
 // utility routine to test if a url is "blank" (either empty or about:blank)
-+(BOOL)isBlankURL:(NSString*)inURL;
-
-// security feature to reset browser
--(IBAction)resetBrowser:(id)sender;
-
-// prompts the user to reset the cache, then does it
-- (IBAction)emptyCache:(id)sender;
++ (BOOL)isBlankURL:(NSString*)inURL;
 
 @end