| Index: chrome/browser/google/google_url_tracker.h
|
| diff --git a/chrome/browser/google/google_url_tracker.h b/chrome/browser/google/google_url_tracker.h
|
| index ab930003369eb8a6b51b4177d195f2914145e5b8..7499dd4577512b50f3920e4292035e44bd0bea7d 100644
|
| --- a/chrome/browser/google/google_url_tracker.h
|
| +++ b/chrome/browser/google/google_url_tracker.h
|
| @@ -20,6 +20,7 @@
|
| #include "net/url_request/url_fetcher_delegate.h"
|
| #include "url/gurl.h"
|
|
|
| +class GoogleURLTrackerClient;
|
| class GoogleURLTrackerNavigationHelper;
|
| class PrefService;
|
| class Profile;
|
| @@ -63,6 +64,7 @@ class GoogleURLTracker : public net::URLFetcherDelegate,
|
| // than the GoogleURLTracker itself should actually use
|
| // GoogleURLTrackerFactory::GetForProfile().
|
| GoogleURLTracker(Profile* profile,
|
| + scoped_ptr<GoogleURLTrackerClient> client,
|
| scoped_ptr<GoogleURLTrackerNavigationHelper> nav_helper,
|
| Mode mode);
|
|
|
| @@ -102,12 +104,12 @@ class GoogleURLTracker : public net::URLFetcherDelegate,
|
| // No one but GoogleURLTrackerMapEntry should call this.
|
| void DeleteMapEntryForService(const InfoBarService* infobar_service);
|
|
|
| - // Called by the navigation observer after SearchCommitted() registers
|
| - // listeners, to indicate that we've received the "load now pending"
|
| - // notification. |navigation_controller| is the NavigationController for this
|
| - // load; |infobar_service| is the InfoBarService of the associated tab; and
|
| - // |pending_id| is the unique ID of the newly pending NavigationEntry.
|
| - // If there is already a visible GoogleURLTracker infobar for this tab, this
|
| + // Called by the client after SearchCommitted() registers listeners, to
|
| + // indicate that we've received the "load now pending" notification.
|
| + // |navigation_controller| is the NavigationController for this load;
|
| + // |infobar_service| is the InfoBarService of the associated tab; and
|
| + // |pending_id| is the unique ID of the newly pending NavigationEntry. If
|
| + // there is already a visible GoogleURLTracker infobar for this tab, this
|
| // function resets its associated pending entry ID to the new ID. Otherwise
|
| // this function creates a map entry for the associated tab.
|
| virtual void OnNavigationPending(
|
| @@ -177,6 +179,8 @@ class GoogleURLTracker : public net::URLFetcherDelegate,
|
|
|
| Profile* profile_;
|
|
|
| + scoped_ptr<GoogleURLTrackerClient> client_;
|
| +
|
| scoped_ptr<GoogleURLTrackerNavigationHelper> nav_helper_;
|
|
|
| // Creates an infobar and adds it to the provided InfoBarService. Returns the
|
|
|