diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 11:29:03 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 11:29:03 +0000 |
| commit | 667b1dd812092dc80759c654d439e06882c74474 (patch) | |
| tree | 8d75b8b6bedc68365664698fe79641237e0eb887 /chrome/browser/ui/search_engines | |
| parent | b9ca3b91adf91b4679b5df0a12d72a5074fc1a00 (diff) | |
| download | chromium_src-667b1dd812092dc80759c654d439e06882c74474.zip chromium_src-667b1dd812092dc80759c654d439e06882c74474.tar.gz chromium_src-667b1dd812092dc80759c654d439e06882c74474.tar.bz2 | |
Nix TemplateURL::logo_id, EXPLICIT_DEFAULT_PROVIDER, etc.
Remove IDR_SEARCH_ENGINE_LOGO_*, references, and utilities.
These are unused after deprecating the first run search engine ballot.
Remove EXPLICIT_DEFAULT_PROVIDER, ConfirmSetDefaultSearchProvider, and DefaultSearchView.
These are unused after the fix for Issue 100946.
Followup CL TODOs:
TODO(msw|pkasting): Remove KeywordTable's logo_id column.
TODO(msw): Nix chrome/app/theme/google/chrome/search_*.png
TODO(msw): Nix chrome/app/theme/search_engine_top.png
BUG=113248,38475,100946,108206
TEST=none
Review URL: http://codereview.chromium.org/9373049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/search_engines')
4 files changed, 4 insertions, 28 deletions
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc index 6d36d5a..0b8c5b3 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -80,10 +80,6 @@ void SearchEngineTabHelper::OnPageHasOSDD( provider_type = TemplateURLFetcher::AUTODETECTED_PROVIDER; break; - case search_provider::EXPLICIT_DEFAULT_PROVIDER: - provider_type = TemplateURLFetcher::EXPLICIT_DEFAULT_PROVIDER; - break; - case search_provider::EXPLICIT_PROVIDER: provider_type = TemplateURLFetcher::EXPLICIT_PROVIDER; break; diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h b/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h index b50732e..b6eaf3b2 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -17,13 +17,6 @@ class WebContents; // SearchEngineTabHelper and to provide necessary functionality. class SearchEngineTabHelperDelegate { public: - // Shows a confirmation dialog box for setting the default search engine - // described by |template_url|. Takes ownership of |template_url|. - virtual void ConfirmSetDefaultSearchProvider( - content::WebContents* tab_contents, - TemplateURL* template_url, - Profile* profile) = 0; - // Shows a confirmation dialog box for adding a search engine described by // |template_url|. Takes ownership of |template_url|. virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, diff --git a/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc b/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc index 9aa4e0e..c2dcf05 100644 --- a/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc +++ b/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -28,17 +28,6 @@ TemplateURLFetcherUICallbacks::TemplateURLFetcherUICallbacks( TemplateURLFetcherUICallbacks::~TemplateURLFetcherUICallbacks() { } -void TemplateURLFetcherUICallbacks::ConfirmSetDefaultSearchProvider( - TemplateURL* template_url, - Profile* profile) { - scoped_ptr<TemplateURL> owned_template_url(template_url); - if (!source_ || !source_->delegate() || !web_contents_) - return; - - source_->delegate()->ConfirmSetDefaultSearchProvider(web_contents_, - owned_template_url.release(), profile); -} - void TemplateURLFetcherUICallbacks::ConfirmAddSearchProvider( TemplateURL* template_url, Profile* profile) { diff --git a/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h b/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h index 76a25f8..717e346 100644 --- a/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h +++ b/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -27,8 +27,6 @@ class TemplateURLFetcherUICallbacks : public TemplateURLFetcherCallbacks, virtual ~TemplateURLFetcherUICallbacks(); // TemplateURLFetcherCallback implementation. - virtual void ConfirmSetDefaultSearchProvider(TemplateURL* template_url, - Profile* profile) OVERRIDE; virtual void ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile) OVERRIDE; |