diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:31:01 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:31:01 +0000 |
| commit | 168a71dcdbde91f44b9d8673951366786ff5182f (patch) | |
| tree | 6ebbbac81664bd32b758431865f84e8615094f60 /chrome/browser/search_engines | |
| parent | bc8f69e0e1ea11ab908b4a59c0c6b794590f3bde (diff) | |
| download | chromium_src-168a71dcdbde91f44b9d8673951366786ff5182f.zip chromium_src-168a71dcdbde91f44b9d8673951366786ff5182f.tar.gz chromium_src-168a71dcdbde91f44b9d8673951366786ff5182f.tar.bz2 | |
Second attempt to land this. This time it compiles on windows, too.
Resuscitate the TOOLKIT_VIEWS build by disabling stuff we don't build yet.
TBR=brettw
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/141012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines')
| -rw-r--r-- | chrome/browser/search_engines/template_url_fetcher.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc index 164a70e..8b14aa3 100644 --- a/chrome/browser/search_engines/template_url_fetcher.cc +++ b/chrome/browser/search_engines/template_url_fetcher.cc @@ -119,6 +119,7 @@ void TemplateURLFetcher::RequestDelegate::OnURLFetchComplete( template_url->set_safe_for_autoreplace(true); model->Add(template_url.release()); } else { +#if defined(OS_WIN) || !defined(TOOLKIT_VIEWS) // Confirm addition and allow user to edit default choices. It's ironic // that only *non*-autodetected additions get confirmed, but the user // expects feedback that his action did something. @@ -128,6 +129,7 @@ void TemplateURLFetcher::RequestDelegate::OnURLFetchComplete( template_url.release(), NULL, // no KeywordEditorView fetcher_->profile()); +#endif } } fetcher_->RequestCompleted(this); |