diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 18:19:39 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 18:19:39 +0000 |
| commit | 2735e369f4c0b7fb9a9d90862cf14dee9c99de53 (patch) | |
| tree | fb5d1ef5f67f192ce505c1255731ae11b4fc40ae /chrome/browser/importer | |
| parent | 0830dedb7c90f4add249828b0147155630c5782f (diff) | |
| download | chromium_src-2735e369f4c0b7fb9a9d90862cf14dee9c99de53.zip chromium_src-2735e369f4c0b7fb9a9d90862cf14dee9c99de53.tar.gz chromium_src-2735e369f4c0b7fb9a9d90862cf14dee9c99de53.tar.bz2 | |
Misc. Cleanup related to OOP Profile Import
* Add PROFILE_IMPORT_PROCESS type to ChildProfileInfo.
* Other small bits of cleanup.
Review URL: http://codereview.chromium.org/220027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/importer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h index df8bc48..1b8499e 100644 --- a/chrome/browser/importer/importer.h +++ b/chrome/browser/importer/importer.h @@ -159,7 +159,7 @@ class ProfileWriter : public base::RefCounted<ProfileWriter> { Profile* profile_; - DISALLOW_EVIL_CONSTRUCTORS(ProfileWriter); + DISALLOW_COPY_AND_ASSIGN(ProfileWriter); }; // This class hosts the importers. It enumerates profiles from other @@ -331,7 +331,7 @@ class ImporterHost : public base::RefCounted<ImporterHost>, // Firefox profile lock. scoped_ptr<FirefoxProfileLock> firefox_lock_; - DISALLOW_EVIL_CONSTRUCTORS(ImporterHost); + DISALLOW_COPY_AND_ASSIGN(ImporterHost); }; // The base class of all importers. @@ -402,7 +402,7 @@ class Importer : public base::RefCounted<Importer> { // True if the importer is created in the first run UI. bool import_to_bookmark_bar_; - DISALLOW_EVIL_CONSTRUCTORS(Importer); + DISALLOW_COPY_AND_ASSIGN(Importer); }; // An interface an object that calls StartImportingWithUI can call to be |