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

Side by Side Diff: chrome/utility/profile_import_handler.h

Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CHROME_UTILITY_PROFILE_IMPORT_HANDLER_H_ 5 #ifndef CHROME_UTILITY_PROFILE_IMPORT_HANDLER_H_
6 #define CHROME_UTILITY_PROFILE_IMPORT_HANDLER_H_ 6 #define CHROME_UTILITY_PROFILE_IMPORT_HANDLER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
11
10 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
11 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "chrome/utility/utility_message_handler.h" 14 #include "chrome/utility/utility_message_handler.h"
14 15
15 class ExternalProcessImporterBridge; 16 class ExternalProcessImporterBridge;
16 class Importer; 17 class Importer;
17 18
18 namespace base { 19 namespace base {
19 class DictionaryValue; 20 class DictionaryValue;
20 class Thread; 21 class Thread;
21 } 22 }
22 23
(...skipping 15 matching lines...) Expand all
38 uint16_t items, 39 uint16_t items,
39 const base::DictionaryValue& localized_strings); 40 const base::DictionaryValue& localized_strings);
40 void OnImportCancel(); 41 void OnImportCancel();
41 void OnImportItemFinished(uint16_t item); 42 void OnImportItemFinished(uint16_t item);
42 43
43 // The following are used with out of process profile import: 44 // The following are used with out of process profile import:
44 void ImporterCleanup(); 45 void ImporterCleanup();
45 46
46 // Thread that importer runs on, while ProfileImportThread handles messages 47 // Thread that importer runs on, while ProfileImportThread handles messages
47 // from the browser process. 48 // from the browser process.
48 scoped_ptr<base::Thread> import_thread_; 49 std::unique_ptr<base::Thread> import_thread_;
49 50
50 // Bridge object is passed to importer, so that it can send IPC calls 51 // Bridge object is passed to importer, so that it can send IPC calls
51 // directly back to the ProfileImportProcessHost. 52 // directly back to the ProfileImportProcessHost.
52 scoped_refptr<ExternalProcessImporterBridge> bridge_; 53 scoped_refptr<ExternalProcessImporterBridge> bridge_;
53 54
54 // A bitmask of importer::ImportItem. 55 // A bitmask of importer::ImportItem.
55 uint16_t items_to_import_; 56 uint16_t items_to_import_;
56 57
57 // Importer of the appropriate type (Firefox, Safari, IE, etc.) 58 // Importer of the appropriate type (Firefox, Safari, IE, etc.)
58 scoped_refptr<Importer> importer_; 59 scoped_refptr<Importer> importer_;
59 }; 60 };
60 61
61 #endif // CHROME_UTILITY_PROFILE_IMPORT_HANDLER_H_ 62 #endif // CHROME_UTILITY_PROFILE_IMPORT_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/utility/media_galleries/pmp_column_reader.h ('k') | chrome/utility/safe_browsing/mac/crdmg.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698