diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 03:59:31 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 03:59:31 +0000 |
| commit | d3f46585fdf14a7f69f12b97a86396e0efdb8773 (patch) | |
| tree | ab73b5cd1d789819ef2ddcbd9ab513b92b0e4e3e /chrome/browser/autocomplete | |
| parent | da7b0ccbf9488b5c7ba091cb3ae381b8b4f98c06 (diff) | |
| download | chromium_src-d3f46585fdf14a7f69f12b97a86396e0efdb8773.zip chromium_src-d3f46585fdf14a7f69f12b97a86396e0efdb8773.tar.gz chromium_src-d3f46585fdf14a7f69f12b97a86396e0efdb8773.tar.bz2 | |
Monitor network change in GoogleURLTracker
BUG=48688,15141
TEST=GoogleURLTrackerTest.MonitorNetworkChange passes
Review URL: http://codereview.chromium.org/3034018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 50321ba..dc4fde3 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -15,8 +15,10 @@ #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/keyword_provider.h" +#include "chrome/browser/browser_list.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/extensions/extension_omnibox_api.h" +#include "chrome/browser/google_url_tracker.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/predictor_api.h" #include "chrome/browser/net/url_fixer_upper.h" @@ -320,6 +322,15 @@ void AutocompleteEditModel::AcceptInput(WindowOpenDisposition disposition, match.transition = PageTransition::LINK; } + if (match.type == AutocompleteMatch::SEARCH_WHAT_YOU_TYPED || + match.type == AutocompleteMatch::SEARCH_HISTORY || + match.type == AutocompleteMatch::SEARCH_SUGGEST) { + const TemplateURL* default_provider = + profile_->GetTemplateURLModel()->GetDefaultSearchProvider(); + if (default_provider && default_provider->url() && + default_provider->url()->HasGoogleBaseURLs()) + GoogleURLTracker::GoogleURLSearchCommitted(); + } view_->OpenURL(match.destination_url, disposition, match.transition, alternate_nav_url, AutocompletePopupModel::kNoMatch, is_keyword_hint_ ? std::wstring() : keyword_); |