| Index: chrome/browser/google/google_url_tracker.h
|
| ===================================================================
|
| --- chrome/browser/google/google_url_tracker.h (revision 136133)
|
| +++ chrome/browser/google/google_url_tracker.h (working copy)
|
| @@ -100,7 +100,7 @@
|
| 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);
|
|
|
| @@ -211,6 +211,12 @@
|
| 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);
|
| @@ -221,7 +227,7 @@
|
| 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:
|
| @@ -229,9 +235,6 @@
|
| 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);
|
| };
|
|
|
|
|