Merge 136205 - Support scheme-setting for GoogleURLTracker.

chrome/browser/google/google_url_tracker.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_GOOGLE_GOOGLE_URL_TRACKER_H_
 #define CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 82 matching lines @@
   friend class GoogleURLTrackerTest;
 
   typedef std::map<const InfoBarTabHelper*,
                    GoogleURLTrackerInfoBarDelegate*> InfoBarMap;
   typedef GoogleURLTrackerInfoBarDelegate* (*InfoBarCreator)(
       InfoBarTabHelper* infobar_helper,
       const GURL& search_url,
       GoogleURLTracker* google_url_tracker,
       const GURL& new_google_url);
 
-  void AcceptGoogleURL(const GURL& google_url);
+  void AcceptGoogleURL(const GURL& google_url, bool redo_searches);
   void CancelGoogleURL(const GURL& google_url);
   void InfoBarClosed(const InfoBarTabHelper* infobar_helper);
 
   // Registers consumer interest in getting an updated URL from the server.
   // It will be notified as chrome::GOOGLE_URL_UPDATED, so the
   // consumer should observe this notification before calling this.
   void SetNeedToFetch();
 
   // Called when the five second startup sleep has finished.  Runs any pending
   // fetch.
@@ skipping 90 matching lines @@
                                   const GURL& search_url,
                                   GoogleURLTracker* google_url_tracker,
                                   const GURL& new_google_url);
 
   // ConfirmInfoBarDelegate:
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual string16 GetLinkText() const OVERRIDE;
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
 
+  // Allows GoogleURLTracker to change the Google base URL after the infobar has
+  // been instantiated.  This should only be called with an URL with the same
+  // TLD as the existing one, so that the prompt we're displaying will still be
+  // correct.
+  void SetGoogleURL(const GURL& new_google_url);
+
   // These are virtual so test code can override them in a subclass.
   virtual void Show();
   virtual void Close(bool redo_search);
 
  protected:
   virtual ~GoogleURLTrackerInfoBarDelegate();
 
   InfoBarTabHelper* map_key_;  // What |google_url_tracker_| uses to track us.
   const GURL search_url_;
   GoogleURLTracker* google_url_tracker_;
-  const GURL new_google_url_;
+  GURL new_google_url_;
   bool showing_;  // True if this delegate has been added to a TabContents.
 
  private:
   // ConfirmInfoBarDelegate:
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
 
-  // Returns the portion of the appropriate hostname to display.
-  string16 GetHost(bool new_host) const;
-
   DISALLOW_COPY_AND_ASSIGN(GoogleURLTrackerInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_