diff options
author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 14:29:58 +0000 |
---|---|---|
committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 14:29:58 +0000 |
commit | 8cfa59ac113544ba3437a9d51ef41304f66f7382 (patch) | |
tree | baf02787b830045f5ad2bb0a67ba1f2dcf6ba34b | |
parent | 14e0a105d9d8d21321345d0825026baab487c8f4 (diff) | |
download | chromium_src-8cfa59ac113544ba3437a9d51ef41304f66f7382.zip chromium_src-8cfa59ac113544ba3437a9d51ef41304f66f7382.tar.gz chromium_src-8cfa59ac113544ba3437a9d51ef41304f66f7382.tar.bz2 |
Initialize AutofillProfileModelAssociator members.
BUG=None
TEST=None
CID=14107, 14380
Review URL: http://codereview.chromium.org/6471026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75588 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/sync/glue/autofill_profile_model_associator.cc | 13 | ||||
-rw-r--r-- | chrome/browser/ui/views/autofill_profiles_view_win.cc | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/chrome/browser/sync/glue/autofill_profile_model_associator.cc b/chrome/browser/sync/glue/autofill_profile_model_associator.cc index 1ef63ec..295a7ca 100644 --- a/chrome/browser/sync/glue/autofill_profile_model_associator.cc +++ b/chrome/browser/sync/glue/autofill_profile_model_associator.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -35,7 +35,14 @@ AutofillProfileModelAssociator::~AutofillProfileModelAssociator() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); } -AutofillProfileModelAssociator::AutofillProfileModelAssociator() {} +AutofillProfileModelAssociator::AutofillProfileModelAssociator() + : sync_service_(NULL), + web_database_(NULL), + personal_data_(NULL), + autofill_node_id_(0), + abort_association_pending_(false), + number_of_profiles_created_(0) { +} bool AutofillProfileModelAssociator::TraverseAndAssociateChromeAutoFillProfiles( sync_api::WriteTransaction* write_trans, @@ -76,7 +83,6 @@ bool AutofillProfileModelAssociator::TraverseAndAssociateChromeAutoFillProfiles( // associated with another profile. That could happen if the user has // the same profile duplicated. current_profiles->find(guid) == current_profiles->end()) { - VLOG(2) << "[AUTOFILL MIGRATION]" << " Found in sync db: " << (*ix)->GetFieldText(AutoFillType(NAME_FIRST)) @@ -331,7 +337,6 @@ bool AutofillProfileModelAssociator::MakeNewAutofillProfileSyncNodeIfNeeded( std::string guid = profile.guid(); Associate(&guid, node.GetId()); number_of_profiles_created_++; - } return true; } diff --git a/chrome/browser/ui/views/autofill_profiles_view_win.cc b/chrome/browser/ui/views/autofill_profiles_view_win.cc index 04ca0e1..46ea0df 100644 --- a/chrome/browser/ui/views/autofill_profiles_view_win.cc +++ b/chrome/browser/ui/views/autofill_profiles_view_win.cc @@ -26,7 +26,6 @@ #include "chrome/common/pref_names.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" -#include "grit/theme_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -1235,7 +1234,8 @@ AutoFillProfilesView::ContentListTableModel::ContentListTableModel( std::vector<EditableSetInfo>* profiles, std::vector<EditableSetInfo>* credit_cards) : profiles_(profiles), - credit_cards_(credit_cards) { + credit_cards_(credit_cards), + observer_(NULL) { } void AutoFillProfilesView::ContentListTableModel::Refresh() { |