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

Unified Diff: chrome/browser/ui/webui/options2/import_data_handler2.cc

Issue 9693032: [uber page] Split up initialization of handlers from initialization of webui pages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: code shuffling Created 8 years, 9 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
Index: chrome/browser/ui/webui/options2/import_data_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/import_data_handler2.cc b/chrome/browser/ui/webui/options2/import_data_handler2.cc
index 7a1ffe35ed4489a8b4b32620910d27e998800742..834eb85d24e4887bd24e2d7860872d753c57069a 100644
--- a/chrome/browser/ui/webui/options2/import_data_handler2.cc
+++ b/chrome/browser/ui/webui/options2/import_data_handler2.cc
@@ -32,7 +32,7 @@ ImportDataHandler::ImportDataHandler() : importer_host_(NULL),
}
ImportDataHandler::~ImportDataHandler() {
- if (importer_list_)
+ if (importer_list_.get())
importer_list_->SetObserver(NULL);
if (importer_host_)
@@ -61,7 +61,7 @@ void ImportDataHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
IDS_IMPORT_SETTINGS_TITLE);
}
-void ImportDataHandler::Initialize() {
+void ImportDataHandler::InitializeHandler() {
Profile* profile = Profile::FromWebUI(web_ui());
importer_list_ = new ImporterList(profile->GetRequestContext());
importer_list_->DetectSourceProfiles(this);
@@ -128,6 +128,13 @@ void ImportDataHandler::ImportData(const ListValue* args) {
}
void ImportDataHandler::OnSourceProfilesLoaded() {
+ InitializePage();
+}
+
+void ImportDataHandler::InitializePage() {
+ if (!importer_list_->source_profiles_loaded())
+ return;
+
ListValue browser_profiles;
for (size_t i = 0; i < importer_list_->count(); ++i) {
const importer::SourceProfile& source_profile =

Powered by Google App Engine
This is Rietveld 408576698