diff options
author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-20 04:21:16 +0000 |
---|---|---|
committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-20 04:21:16 +0000 |
commit | c78b1e1619d7e700fce78f29533eba5ee78b0c70 (patch) | |
tree | 455f30adcb00e3b4cf41c392150a62722652cdf6 /chrome/browser/autocomplete | |
parent | 9f602b88a2e61320d3ff3a5ef44b1714f3a60faa (diff) | |
download | chromium_src-c78b1e1619d7e700fce78f29533eba5ee78b0c70.zip chromium_src-c78b1e1619d7e700fce78f29533eba5ee78b0c70.tar.gz chromium_src-c78b1e1619d7e700fce78f29533eba5ee78b0c70.tar.bz2 |
Reland r56483 - Monitor network change in GoogleURLTracker
It changes to fetch https://www.google.com/searchdomaincheck?format=domain&type=chrome
instead of checking http://www.google.com/ redirection.
Also show infobar if google domain has been changed to new domain and ask
user to switch new domain.
Fix Win IO Perf regressions:
- GoogleURLTracker::RequestServerCheck() is not called in headless mode
(CHROME_HEADLESS=1) nor in Chrome Frame (--chrome-frame).
Fix leaks in TestingProfile::CreateRequestContext(): 52562
- Add TestURLFetcher::set_request_context() do nothing, because TestURLFetcher
might miss to release core_->request_context_getter_.
Fix GoogleURLTracker observer removal DCHECK: 52608
- call RemoveAll(), instead of calling Remove()s
BUG=48688,15141,52477,52562,52608
TEST=unit_tests passes
Review URL: http://codereview.chromium.org/3171019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56811 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_); |