Refactor Instant to separate out preview control

Separates out Show/Hide logic into a separate |InstantPreviewController|
class.  This class follows an observer pattern, observing the |InstantModel|
changes.  The model is held by the |InstantController|.

The goal with this is to pave the way for future changes that will expand the
complexity of the "view" logic, especially in the area of coordinating the
animations used with --enable-instant-extended-api features.

BUG=142785
TEST=No functional change.  Refactoring only.
R=sreeram@chromium.org, jered@chromium.org, samarth@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11144004

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

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h
index 5caa6b4..f4599d4 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.h
+++ b/chrome/browser/ui/gtk/browser_window_gtk.h
@@ -35,6 +35,7 @@ class FindBarGtk;
 class FullscreenExitBubbleGtk;
 class GlobalMenuBar;
 class InfoBarContainerGtk;
+class InstantPreviewControllerGtk;
 class LocationBar;
 class PrefService;
 class StatusBubbleGtk;
@@ -159,10 +160,6 @@ class BrowserWindowGtk
   virtual void Cut() OVERRIDE;
   virtual void Copy() OVERRIDE;
   virtual void Paste() OVERRIDE;
-  virtual void ShowInstant(TabContents* preview,
-                           int height,
-                           InstantSizeUnits units) OVERRIDE;
-  virtual void HideInstant() OVERRIDE;
   virtual gfx::Rect GetInstantBounds() OVERRIDE;
   virtual bool IsInstantTabShowing() OVERRIDE;
   virtual WindowOpenDisposition GetDispositionForPopupBounds(
@@ -269,6 +266,9 @@ class BrowserWindowGtk
   // |relative_to| coordinates. This is the middle of the omnibox location icon.
   int GetXPositionOfLocationIcon(GtkWidget* relative_to);
 
+  // Show or hide the bookmark bar.
+  void MaybeShowBookmarkBar(bool animate);
+
  protected:
   virtual void DestroyBrowser() OVERRIDE;
 
@@ -315,9 +315,6 @@ class BrowserWindowGtk
   scoped_ptr<Browser> browser_;
 
  private:
-  // Show or hide the bookmark bar.
-  void MaybeShowBookmarkBar(bool animate);
-
   // Connect to signals on |window_|.
   void ConnectHandlersToSignals();
 
@@ -495,6 +492,9 @@ class BrowserWindowGtk
   // selected tab contents.
   scoped_ptr<TabContentsContainerGtk> devtools_container_;
 
+  // A sub-controller that manages the Instant preview visual state.
+  scoped_ptr<InstantPreviewControllerGtk> instant_preview_controller_;
+
   // The Extension Keybinding Registry responsible for registering listeners for
   // accelerators that are sent to the window, that are destined to be turned
   // into events and sent to the extension.