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

Side by Side Diff: components/autofill/core/browser/personal_data_manager.h

Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Windows Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_ 5 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
6 #define COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_ 6 #define COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
7 7
8 #include <memory>
8 #include <set> 9 #include <set>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/basictypes.h" 12 #include "base/basictypes.h"
12 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
13 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
15 #include "base/observer_list.h" 16 #include "base/observer_list.h"
16 #include "base/prefs/pref_member.h" 17 #include "base/prefs/pref_member.h"
17 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 friend class autofill::AutofillInteractiveTest; 238 friend class autofill::AutofillInteractiveTest;
238 friend class autofill::AutofillTest; 239 friend class autofill::AutofillTest;
239 friend class autofill::PersonalDataManagerFactory; 240 friend class autofill::PersonalDataManagerFactory;
240 friend class PersonalDataManagerTest; 241 friend class PersonalDataManagerTest;
241 #if defined(OS_IOS) 242 #if defined(OS_IOS)
242 // TODO(crbug.com/513344): Remove this once Chrome on iOS is unforked. 243 // TODO(crbug.com/513344): Remove this once Chrome on iOS is unforked.
243 friend class ::PersonalDataManagerFactory; 244 friend class ::PersonalDataManagerFactory;
244 #endif 245 #endif
245 friend class ProfileSyncServiceAutofillTest; 246 friend class ProfileSyncServiceAutofillTest;
246 friend class ::RemoveAutofillTester; 247 friend class ::RemoveAutofillTester;
247 friend struct base::DefaultDeleter<PersonalDataManager>; 248 friend std::default_delete<PersonalDataManager>;
248 friend void autofill_helper::SetProfiles( 249 friend void autofill_helper::SetProfiles(
249 int, std::vector<autofill::AutofillProfile>*); 250 int, std::vector<autofill::AutofillProfile>*);
250 friend void autofill_helper::SetCreditCards( 251 friend void autofill_helper::SetCreditCards(
251 int, std::vector<autofill::CreditCard>*); 252 int, std::vector<autofill::CreditCard>*);
252 friend void SetTestProfiles( 253 friend void SetTestProfiles(
253 Browser* browser, std::vector<AutofillProfile>* profiles); 254 Browser* browser, std::vector<AutofillProfile>* profiles);
254 255
255 // Sets |web_profiles_| to the contents of |profiles| and updates the web 256 // Sets |web_profiles_| to the contents of |profiles| and updates the web
256 // database by adding, updating and removing profiles. 257 // database by adding, updating and removing profiles.
257 // The relationship between this and Refresh is subtle. 258 // The relationship between this and Refresh is subtle.
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 386
386 // An observer to listen for changes to prefs::kAutofillWalletImportEnabled. 387 // An observer to listen for changes to prefs::kAutofillWalletImportEnabled.
387 scoped_ptr<BooleanPrefMember> wallet_enabled_pref_; 388 scoped_ptr<BooleanPrefMember> wallet_enabled_pref_;
388 389
389 DISALLOW_COPY_AND_ASSIGN(PersonalDataManager); 390 DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
390 }; 391 };
391 392
392 } // namespace autofill 393 } // namespace autofill
393 394
394 #endif // COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_ 395 #endif // COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698