Index: chrome/browser/importer/importer_list.cc |
diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc |
index e22f547642a65056c6542ea44bdc3d4c5de713e2..173dad470d0d54038ce058a75eb15473449d1bc7 100644 |
--- a/chrome/browser/importer/importer_list.cc |
+++ b/chrome/browser/importer/importer_list.cc |
@@ -5,7 +5,6 @@ |
#include "chrome/browser/importer/importer_list.h" |
#include "base/bind.h" |
-#include "chrome/browser/first_run/first_run.h" |
#include "chrome/browser/importer/firefox_importer_utils.h" |
#include "chrome/browser/importer/importer_bridge.h" |
#include "chrome/browser/importer/importer_data_types.h" |
@@ -96,34 +95,13 @@ void DetectFirefoxProfiles(const std::string locale, |
profiles->push_back(firefox); |
} |
-#if defined(OS_WIN) |
-void DetectGoogleToolbarProfiles( |
- std::vector<importer::SourceProfile*>* profiles, |
- scoped_refptr<net::URLRequestContextGetter> request_context_getter) { |
- if (first_run::IsChromeFirstRun()) |
- return; |
- |
- importer::SourceProfile* google_toolbar = new importer::SourceProfile; |
- google_toolbar->importer_name = |
- l10n_util::GetStringUTF16(IDS_IMPORT_FROM_GOOGLE_TOOLBAR); |
- google_toolbar->importer_type = importer::TYPE_GOOGLE_TOOLBAR5; |
- google_toolbar->source_path.clear(); |
- google_toolbar->app_path.clear(); |
- google_toolbar->services_supported = importer::FAVORITES; |
- google_toolbar->request_context_getter = request_context_getter; |
- profiles->push_back(google_toolbar); |
-} |
-#endif |
- |
} // namespace |
-ImporterList::ImporterList( |
- net::URLRequestContextGetter* request_context_getter) |
+ImporterList::ImporterList() |
: source_thread_id_(BrowserThread::UI), |
observer_(NULL), |
is_observed_(false), |
source_profiles_loaded_(false) { |
- request_context_getter_ = make_scoped_refptr(request_context_getter); |
} |
void ImporterList::DetectSourceProfiles( |
@@ -190,8 +168,6 @@ void ImporterList::DetectSourceProfilesWorker(const std::string& locale) { |
DetectIEProfiles(&profiles); |
DetectFirefoxProfiles(locale, &profiles); |
} |
- // TODO(brg) : Current UI requires win_util. |
- DetectGoogleToolbarProfiles(&profiles, request_context_getter_); |
#elif defined(OS_MACOSX) |
if (ShellIntegration::IsFirefoxDefaultBrowser()) { |
DetectFirefoxProfiles(locale, &profiles); |