Rejiggers the keyword editor so that the UI is independent of the model rather than being derived from it. This reduces the spaghetti somewhat. Also decouples the notion of a native view hierarchy from the location in TabContents::PageHasOSDD where the template URL fetcher is spawned. The Template URL Fetcher now simply retains a reference to the TabContents that created it. If the TabContents is destroyed before the fetch completes, we just discard the data retrieved without adding a keyword.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/140054

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

1 files changed, 8 insertions, 10 deletions

diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 666cc2cc..bdaf9f9 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -373,7 +373,6 @@ class Browser : public TabStripModelDelegate,
   void OpenAboutChromeDialog();
   void OpenHelpTab();
 
-  virtual void OnStartDownload(DownloadItem* download);
   virtual void UpdateDownloadShelfVisibility(bool visible);
 
   /////////////////////////////////////////////////////////////////////////////
@@ -471,29 +470,28 @@ class Browser : public TabStripModelDelegate,
   virtual bool IsPopup(TabContents* source);
   virtual void ToolbarSizeChanged(TabContents* source, bool is_animating);
   virtual void URLStarredChanged(TabContents* source, bool starred);
-
-  // A mouse event occurred; motion==true is mouse movement, motion==false
-  // is the mouse leaving the view.
-  virtual void ContentsMouseEvent(TabContents* source, bool motion);
   virtual void UpdateTargetURL(TabContents* source, const GURL& url);
-
+  virtual void ContentsMouseEvent(TabContents* source, bool motion);
   virtual void ContentsZoomChange(bool zoom_in);
   virtual void TabContentsFocused(TabContents* tab_content);
   virtual bool IsApplication() const;
   virtual void ConvertContentsToApplication(TabContents* source);
   virtual bool ShouldDisplayURLField();
-  virtual void BeforeUnloadFired(TabContents* source,
-                                 bool proceed,
-                                 bool* proceed_to_fire_unload);
   virtual gfx::Rect GetRootWindowResizerRect() const;
   virtual void ShowHtmlDialog(HtmlDialogUIDelegate* delegate,
                               gfx::NativeWindow parent_window);
+  virtual void BeforeUnloadFired(TabContents* source,
+                                 bool proceed,
+                                 bool* proceed_to_fire_unload);
   virtual void SetFocusToLocationBar();
   virtual void RenderWidgetShowing();
-  virtual ExtensionFunctionDispatcher *CreateExtensionFunctionDispatcher(
+  virtual ExtensionFunctionDispatcher* CreateExtensionFunctionDispatcher(
       RenderViewHost* render_view_host,
       const std::string& extension_id);
   virtual int GetExtraRenderViewHeight() const;
+  virtual void OnStartDownload(DownloadItem* download);
+  virtual void ConfirmAddSearchProvider(const TemplateURL* template_url,
+                                        Profile* profile);
 
   // Overridden from SelectFileDialog::Listener:
   virtual void FileSelected(const FilePath& path, int index, void* params);