More scaffolding for back/forward, start of WebContents

chrome/browser/browser.h

Index: chrome/browser/browser.h
===================================================================
--- chrome/browser/browser.h	(revision 8452)
+++ chrome/browser/browser.h	(working copy)
@@ -230,11 +230,13 @@
   // NOTE: Within each of the following sections, the IDs are ordered roughly by
   // how they appear in the GUI/menus (left to right, top to bottom, etc.).
 
+#endif
   // Navigation commands
   void GoBack();
   void GoForward();
   void Reload();
   void Home();
+#if defined(OS_WIN)
   void OpenCurrentURL();
   void Go();
   void Stop();
@@ -342,7 +344,9 @@
       PageTransition::Type transition,
       bool defer_load,
       SiteInstance* instance) const;
+#endif
   virtual bool CanDuplicateContentsAt(int index);
+#if defined(OS_WIN)
   virtual void DuplicateContentsAt(int index);
   virtual void CloseFrameAfterDragSession();
 
@@ -412,7 +416,6 @@
   // Initialize state for all browser commands.
   void InitCommandState();
 
-#if defined(OS_WIN)
   // Update commands which may be enabled or disabled depending on the tab's
   // state.
   void UpdateCommandsForTabState();
@@ -425,6 +428,7 @@
   // TODO(evanm): migrate this to the commands framework.
   void SetStarredButtonToggled(bool starred);
 
+#if defined(OS_WIN)
   // UI update coalescing and handling ////////////////////////////////////////
 
   // Asks the toolbar (and as such the location bar) to update its state to
@@ -455,7 +459,6 @@
   // Getters for the location bar and go button.
 #endif  // OS_WIN
   LocationBarView* GetLocationBarView() const;
-#if defined(OS_WIN)
   GoButton* GetGoButton();
 
   // Returns the StatusBubble from the current toolbar. It is possible for
@@ -463,6 +466,7 @@
   // TODO(beng): remove this.
   StatusBubble* GetStatusBubble();
 
+#if defined(OS_WIN)
   // Session restore functions ////////////////////////////////////////////////
 
   // Notifies the history database of the index for all tabs whose index is
@@ -515,11 +519,13 @@
   void BuildPopupWindow(TabContents* source,
                         TabContents* new_contents,
                         const gfx::Rect& initial_pos);
+#endif
 
   // Returns what the user's home page is, or the new tab page if the home page
   // has not been set.
   GURL GetHomePage();
 
+#if defined(OS_WIN)
   // Advance the find selection by one. Direction is either forward or
   // backwards depending on parameter passed in.
   void AdvanceFindSelection(bool forward_direction);