Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7174)

Unified Diff: chrome/browser/ui/webui/options/import_data_handler.cc

Issue 18120005: Remove Google Toolbar importer (aka google.com/bookmarks importer). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: -explicit Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/importer/toolbar_importer_utils_browsertest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/import_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc
index 5c5c339285f0b9bb04cf1c13e9ac5ba0eb04fec9..6a2021690387aafe0d26d898016da14d0c0b188b 100644
--- a/chrome/browser/ui/webui/options/import_data_handler.cc
+++ b/chrome/browser/ui/webui/options/import_data_handler.cc
@@ -18,7 +18,6 @@
#include "base/values.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/importer/external_process_importer_host.h"
-#include "chrome/browser/importer/importer_host.h"
#include "chrome/browser/importer/importer_list.h"
#include "chrome/browser/importer/importer_type.h"
#include "chrome/browser/profiles/profile.h"
@@ -65,8 +64,7 @@ void ImportDataHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
}
void ImportDataHandler::InitializeHandler() {
- Profile* profile = Profile::FromWebUI(web_ui());
- importer_list_ = new ImporterList(profile->GetRequestContext());
+ importer_list_ = new ImporterList();
importer_list_->DetectSourceProfiles(
g_browser_process->GetApplicationLocale(), this);
}
@@ -111,16 +109,8 @@ void ImportDataHandler::ImportData(const ListValue* args) {
state);
import_did_succeed_ = false;
- // The Google Toolbar importer doesn't work for the out-of-process import.
- // This is the only entry point for this importer (it is never used on first
- // run). See discussion on http://crbug.com/219419 for details.
- if (source_profile.importer_type == importer::TYPE_GOOGLE_TOOLBAR5)
- importer_host_ = new ImporterHost;
- else
- importer_host_ = new ExternalProcessImporterHost;
+ importer_host_ = new ExternalProcessImporterHost();
importer_host_->SetObserver(this);
- importer_host_->set_browser(
- chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()));
Profile* profile = Profile::FromWebUI(web_ui());
importer_host_->StartImportSettings(source_profile, profile,
import_services,
« no previous file with comments | « chrome/browser/importer/toolbar_importer_utils_browsertest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698