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

Unified Diff: chrome/profile_import/profile_import_thread.h

Issue 3654001: Revert 61899 for breaking cookes on file:// URLs.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 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/profile_import/profile_import_thread.h
===================================================================
--- chrome/profile_import/profile_import_thread.h (revision 62042)
+++ chrome/profile_import/profile_import_thread.h (working copy)
@@ -28,7 +28,7 @@
class ProfileImportThread : public ChildThread {
public:
ProfileImportThread();
- virtual ~ProfileImportThread();
+ virtual ~ProfileImportThread() {}
// Returns the one profile import thread.
static ProfileImportThread* current() {
@@ -84,7 +84,7 @@
// Bridge object is passed to importer, so that it can send IPC calls
// directly back to the ProfileImportProcessHost.
- scoped_refptr<ExternalProcessImporterBridge> bridge_;
+ ExternalProcessImporterBridge* bridge_;
// importer::ProfileType enum from importer_list, stored in ProfileInfo
// struct in importer.
@@ -94,7 +94,7 @@
uint16 items_to_import_;
// Importer of the appropriate type (Firefox, Safari, IE, etc.)
- scoped_refptr<Importer> importer_;
+ Importer* importer_;
DISALLOW_COPY_AND_ASSIGN(ProfileImportThread);
};
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_service.cc ('k') | chrome/profile_import/profile_import_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698