Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: chrome/browser/google_url_tracker.h

Issue 3171019: Reland r56483 - Monitor network change in GoogleURLTracker (Closed)
Patch Set: check Chrome Frame Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit.cc ('k') | chrome/browser/google_url_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google_url_tracker.h
diff --git a/chrome/browser/google_url_tracker.h b/chrome/browser/google_url_tracker.h
index 06274c05316bc07d3e2fb46d9867084945778c09..9d6b218d33f3e7fc8b0b1edd44bfe1d0a9e193b5 100644
--- a/chrome/browser/google_url_tracker.h
+++ b/chrome/browser/google_url_tracker.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
@@ -13,11 +13,17 @@
#include "chrome/common/net/url_fetcher.h"
#include "chrome/common/notification_registrar.h"
#include "googleurl/src/gurl.h"
+#include "net/base/network_change_notifier.h"
+class InfoBarDelegate;
+class NavigationController;
class PrefService;
+class TabContents;
+class TemplateURL;
-// This object is responsible for updating the Google URL at most once per run,
-// and tracking the currently known value, which is also saved to a pref.
+// This object is responsible for checking the Google URL once per network
+// change, and if necessary prompting the user to see if they want to change to
+// using it. The current and last prompted values are saved to prefs.
//
// Most consumers should only call GoogleURL(), which is guaranteed to
// synchronously return a value at all times (even during startup or in unittest
@@ -29,8 +35,17 @@ class PrefService;
// performed (ever) unless at least one consumer registers interest by calling
// RequestServerCheck().
class GoogleURLTracker : public URLFetcher::Delegate,
- public NotificationObserver {
+ public NotificationObserver,
+ public net::NetworkChangeNotifier::Observer {
public:
+ class InfoBarDelegateFactory {
+ public:
+ virtual ~InfoBarDelegateFactory() {}
+ virtual InfoBarDelegate* CreateInfoBar(TabContents* tab_contents,
+ GoogleURLTracker* google_url_tracker,
+ const GURL& new_google_url);
+ };
+
// Only the main browser process loop should call this, when setting up
// g_browser_process->google_url_tracker_. No code other than the
// GoogleURLTracker itself should actually use
@@ -39,7 +54,7 @@ class GoogleURLTracker : public URLFetcher::Delegate,
// anyway).
GoogleURLTracker();
- ~GoogleURLTracker();
+ virtual ~GoogleURLTracker();
// Returns the current Google URL. This will return a valid URL even in
// unittest mode.
@@ -48,27 +63,38 @@ class GoogleURLTracker : public URLFetcher::Delegate,
static GURL GoogleURL();
// Requests that the tracker perform a server check to update the Google URL
- // as necessary. This will happen at most once per run, not sooner than five
- // seconds after startup (checks requested before that time will occur then;
- // checks requested afterwards will occur immediately, if no other checks have
- // been made during this run).
+ // as necessary. This will happen at most once per network change, not
+ // sooner than five seconds after startup (checks requested before that time
+ // will occur then; checks requested afterwards will occur immediately, if
+ // no other checks have been made during this run).
//
// In unittest mode, this function does nothing.
static void RequestServerCheck();
static void RegisterPrefs(PrefService* prefs);
+ // Notifies the tracker that the user has started a Google search.
+ // If prompting is necessary, we then listen for the subsequent
+ // NAV_ENTRY_PENDING notification to get the appropriate NavigationController.
+ // When the load commits, we'll show the infobar.
+ static void GoogleURLSearchCommitted();
+
static const char kDefaultGoogleHomepage[];
+ static const char kSearchDomainCheckURL[];
- private:
- FRIEND_TEST_ALL_PREFIXES(GoogleURLTrackerTest, CheckAndConvertURL);
+ // Methods called from InfoBar delegate.
+ void AcceptGoogleURL(const GURL& google_url);
+ void InfoBarClosed();
+ void RedoSearch();
+
+ NavigationController* controller() const { return controller_; }
- // Determines if |url| is an appropriate source for a new Google base URL, and
- // update |base_url| to the appropriate base URL if so. Returns whether the
- // check succeeded (and thus whether |base_url| was actually updated).
- static bool CheckAndConvertToGoogleBaseURL(const GURL& url, GURL* base_url);
+ private:
+ friend class GoogleURLTrackerTest;
// Registers consumer interest in getting an updated URL from the server.
+ // It will be notified as NotificationType::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
@@ -92,10 +118,22 @@ class GoogleURLTracker : public URLFetcher::Delegate,
const NotificationSource& source,
const NotificationDetails& details);
+ // NetworkChangeNotifier::Observer
+ virtual void OnIPAddressChanged();
+
+ void SearchCommitted();
+
+ void ShowGoogleURLInfoBarIfNecessary(TabContents* tab_contents);
+
NotificationRegistrar registrar_;
+ // TODO(ukai): GoogleURLTracker should track google domain (e.g. google.co.uk)
+ // rather than URL (e.g. http://www.google.co.uk/), so that user could
+ // configure to use https in search engine templates.
GURL google_url_;
- ScopedRunnableMethodFactory<GoogleURLTracker> fetcher_factory_;
+ GURL fetched_google_url_;
+ ScopedRunnableMethodFactory<GoogleURLTracker> runnable_method_factory_;
scoped_ptr<URLFetcher> fetcher_;
+ int fetcher_id_;
bool in_startup_sleep_; // True if we're in the five-second "no fetching"
// period that begins at browser start.
bool already_fetched_; // True if we've already fetched a URL once this run;
@@ -103,10 +141,19 @@ class GoogleURLTracker : public URLFetcher::Delegate,
bool need_to_fetch_; // True if a consumer actually wants us to fetch an
// updated URL. If this is never set, we won't
// bother to fetch anything.
+ // Consumers should observe
+ // NotificationType::GOOGLE_URL_UPDATED.
bool request_context_available_;
// True when the profile has been loaded and the
// default request context created, so we can
// actually do the fetch with the right data.
+ bool need_to_prompt_; // True if the last fetched Google URL is not
+ // matched with current user's default Google URL
+ // nor the last prompted Google URL.
+ NavigationController* controller_;
+ scoped_ptr<InfoBarDelegateFactory> infobar_factory_;
+ InfoBarDelegate* infobar_;
+ GURL search_url_;
DISALLOW_COPY_AND_ASSIGN(GoogleURLTracker);
};
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit.cc ('k') | chrome/browser/google_url_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698