Bunch of match preview tweaks:

chrome/browser/browser.h

 // Copyright (c) 2010 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_BROWSER_H_
 #define CHROME_BROWSER_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
+#include "base/string16.h"
 #include "base/task.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/tab_contents/match_preview_delegate.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/page_zoom.h"
 #include "gfx/rect.h"
 
 class BrowserWindow;
 class Extension;
 class FindBarController;
+class MatchPreview;
 class PrefService;
 class Profile;
 class SessionStorageNamespace;
 class SkBitmap;
 class StatusBubble;
 class TabNavigation;
 namespace gfx {
 class Point;
 }
 
 class Browser : public TabStripModelDelegate,
                 public TabStripModelObserver,
                 public TabContentsDelegate,
                 public PageNavigator,
                 public CommandUpdater::CommandUpdaterDelegate,
                 public NotificationObserver,
                 public SelectFileDialog::Listener,
                 public TabRestoreServiceObserver,
-                public ProfileSyncServiceObserver {
+                public ProfileSyncServiceObserver,
+                public MatchPreviewDelegate {
  public:
   // If you change the values in this enum you'll need to update browser_proxy.
   // TODO(sky): move into a common place that is referenced by both ui_tests
   // and chrome.
   enum Type {
     TYPE_NORMAL = 1,
     TYPE_POPUP = 2,
     // The old-style app created via "Create application shortcuts".
     TYPE_APP = 4,
     // The new-style app created by installing a crx. This kinda needs to be
@@ skipping 89 matching lines @@
   // possible. This does not show the window. You need to call window()->Show()
   // to show it.
   void CreateBrowserWindow();
 
   // Accessors ////////////////////////////////////////////////////////////////
 
   Type type() const { return type_; }
   Profile* profile() const { return profile_; }
   const std::vector<std::wstring>& user_data_dir_profiles() const;
 
+  // Returns the MatchPreview or NULL if there is no MatchPreview for this
+  // Browser.
+  MatchPreview* match_preview() const { return match_preview_.get(); }
+
 #if defined(UNIT_TEST)
   // Sets the BrowserWindow. This is intended for testing and generally not
   // useful outside of testing. Use CreateBrowserWindow outside of testing, or
   // the static convenience methods that create a BrowserWindow for you.
   void set_window(BrowserWindow* window) {
     DCHECK(!window_);
     window_ = window;
   }
 #endif
 
@@ skipping 575 matching lines @@
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
   virtual void ShowRepostFormWarningDialog(TabContents* tab_contents);
   virtual void ShowContentSettingsWindow(ContentSettingsType content_type);
   virtual void ShowCollectedCookiesDialog(TabContents* tab_contents);
   virtual bool ShouldAddNavigationToHistory(
       const history::HistoryAddPageArgs& add_page_args,
       NavigationType::Type navigation_type);
   virtual void OnDidGetApplicationInfo(TabContents* tab_contents,
                                        int32 page_id);
   virtual void ContentTypeChanged(TabContents* source);
-  virtual void CommitMatchPreview(TabContents* source);
 
   // Overridden from SelectFileDialog::Listener:
   virtual void FileSelected(const FilePath& path, int index, void* params);
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Overridden from ProfileSyncServiceObserver:
   virtual void OnStateChanged();
 
+  // Overriden from MatchPreviewDelegate:
+  virtual void ShowMatchPreview();
+  virtual void HideMatchPreview();
+  virtual void CommitMatchPreview();
+  virtual void SetSuggestedText(const string16& text);
+
   // Command and state updating ///////////////////////////////////////////////
 
   // Initialize state for all browser commands.
   void InitCommandState();
 
   // Update commands whose state depends on the tab's state.
   void UpdateCommandsForTabState();
 
   // Update zoom commands based on the tab's state
   void UpdateZoomCommandsForTabState();
@@ skipping 290 matching lines @@
   // The extension app associated with this window, if any.
   Extension* extension_app_;
 
   // Tracks the display mode of the tabstrip.
   mutable BooleanPrefMember use_vertical_tabs_;
 
   // The profile's tab restore service. The service is owned by the profile,
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;
 
+  scoped_ptr<MatchPreview> match_preview_;
+
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_H_