Add core plumbing for Instant Extended work

chrome/browser/ui/browser.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 52 matching lines @@
 class InstantController;
 class InstantUnloadHandler;
 class PrefService;
 class Profile;
 class SkBitmap;
 class StatusBubble;
 class TabNavigation;
 class TabStripModel;
 struct WebApplicationInfo;
 
+namespace chrome {
+namespace search {
+class SearchDelegate;
+class SearchModel;
+}
+}
+
 namespace content {
 class NavigationController;
 class SessionStorageNamespace;
 }
 
 namespace extensions {
 class Extension;
 }
 
 namespace gfx {
@@ skipping 186 matching lines @@
   gfx::Rect override_bounds() const { return override_bounds_; }
 
   // Returns the InstantController or NULL if there is no InstantController for
   // this Browser.
   InstantController* instant() const { return instant_.get(); }
 
   // |window()| will return NULL if called before |CreateBrowserWindow()|
   // is done.
   BrowserWindow* window() const { return window_; }
   ToolbarModel* toolbar_model() { return toolbar_model_.get(); }
+  chrome::search::SearchModel* search_model() { return search_model_.get(); }
   const SessionID& session_id() const { return session_id_; }
   CommandUpdater* command_updater() { return &command_updater_; }
   bool block_command_execution() const { return block_command_execution_; }
   BrowserContentSettingBubbleModelDelegate*
       content_setting_bubble_model_delegate() {
     return content_setting_bubble_model_delegate_.get();
   }
   BrowserTabRestoreServiceDelegate* tab_restore_service_delegate() {
     return tab_restore_service_delegate_.get();
   }
@@ skipping 847 matching lines @@
 
   // UI update coalescing and handling ////////////////////////////////////////
 
   // Asks the toolbar (and as such the location bar) to update its state to
   // reflect the current tab's current URL, security state, etc.
   // If |should_restore_state| is true, we're switching (back?) to this tab and
   // should restore any previous location bar state (such as user editing) as
   // well.
   void UpdateToolbar(bool should_restore_state);
 
+  // Updates the browser's search model with the tab's search model.
+  void UpdateSearchState(TabContents* contents);
+
   // Does one or both of the following for each bit in |changed_flags|:
   // . If the update should be processed immediately, it is.
   // . If the update should processed asynchronously (to avoid lots of ui
   //   updates), then scheduled_updates_ is updated for the |source| and update
   //   pair and a task is scheduled (assuming it isn't running already)
   //   that invokes ProcessPendingUIUpdates.
   void ScheduleUIUpdate(const content::WebContents* source,
                         unsigned changed_flags);
 
   // Processes all pending updates to the UI that have been scheduled by
@@ skipping 173 matching lines @@
   AppType app_type_;
 
   // Unique identifier of this browser for session restore. This id is only
   // unique within the current session, and is not guaranteed to be unique
   // across sessions.
   const SessionID session_id_;
 
   // The model for the toolbar view.
   scoped_ptr<ToolbarModel> toolbar_model_;
 
+  // The model for the "active" search state.

[sky, 2012/06/21 18:26:49]

Wrap these to 80 chars please.

[dhollowa, 2012/06/21 22:16:43]

Done.

+  // There are per-tab search models as well.  When a tab is active
+  // its model is kept in sync with this one.  When a new tab is activated
+  // its model state is propagated to this active model.  This way, observers
+  // only have to attach to this single model for updates, and don't have to
+  // worry about active tab changes directly.
+  scoped_ptr<chrome::search::SearchModel> search_model_;
+
   // UI update coalescing and handling ////////////////////////////////////////
 
   typedef std::map<const content::WebContents*, int> UpdateMap;
 
   // Maps from WebContents to pending UI updates that need to be processed.
   // We don't update things like the URL or tab title right away to avoid
   // flickering and extra painting.
   // See ScheduleUIUpdate and ProcessPendingUIUpdates.
   UpdateMap scheduled_updates_;
 
@@ skipping 71 matching lines @@
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;
 
   // Helper which implements the ContentSettingBubbleModel interface.
   scoped_ptr<BrowserContentSettingBubbleModelDelegate>
       content_setting_bubble_model_delegate_;
 
   // Helper which implements the ToolbarModelDelegate interface.
   scoped_ptr<BrowserToolbarModelDelegate> toolbar_model_delegate_;
 
+  // A delegate that handles the details of updating the "active"
+  // |search_model_| state with the tab's state.
+  scoped_ptr<chrome::search::SearchDelegate> search_delegate_;
+
   // Helper which implements the TabRestoreServiceDelegate interface.
   scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_;
 
   // Helper which implements the SyncedWindowDelegate interface.
   scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_;
 
   scoped_ptr<InstantController> instant_;
   scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
 
   BookmarkBar::State bookmark_bar_state_;
 
   scoped_refptr<FullscreenController> fullscreen_controller_;
 
   scoped_ptr<ExtensionWindowController> extension_window_controller_;
 
   // True if the browser window has been shown at least once.
   bool window_has_shown_;
 
   // Currently open color chooser. Non-NULL after OpenColorChooser is called and
   // before DidEndColorChooser is called.
   scoped_ptr<content::ColorChooser> color_chooser_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_