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

Side by Side Diff: chrome/browser/importer/importer_host.h

Issue 14316007: Remove unused |first_run| parameter in ImporterHost::CheckForFirefoxLock() which results in a casca… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge up to r196136 Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BROWSER_IMPORTER_IMPORTER_HOST_H_ 5 #ifndef CHROME_BROWSER_IMPORTER_IMPORTER_HOST_H_
6 #define CHROME_BROWSER_IMPORTER_IMPORTER_HOST_H_ 6 #define CHROME_BROWSER_IMPORTER_IMPORTER_HOST_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 } 67 }
68 68
69 void set_browser(Browser* browser) { browser_ = browser; } 69 void set_browser(Browser* browser) { browser_ = browser; }
70 70
71 // Starts the process of importing the settings and data depending on what the 71 // Starts the process of importing the settings and data depending on what the
72 // user selected. 72 // user selected.
73 // |source_profile| - importer profile to import. 73 // |source_profile| - importer profile to import.
74 // |target_profile| - profile to import into. 74 // |target_profile| - profile to import into.
75 // |items| - specifies which data to import (bitmask of importer::ImportItem). 75 // |items| - specifies which data to import (bitmask of importer::ImportItem).
76 // |writer| - called to actually write data back to the profile. 76 // |writer| - called to actually write data back to the profile.
77 // |first_run| - true if this method is being called during first run.
78 virtual void StartImportSettings( 77 virtual void StartImportSettings(
79 const importer::SourceProfile& source_profile, 78 const importer::SourceProfile& source_profile,
80 Profile* target_profile, 79 Profile* target_profile,
81 uint16 items, 80 uint16 items,
82 ProfileWriter* writer, 81 ProfileWriter* writer);
83 bool first_run);
84 82
85 // Cancels the import process. 83 // Cancels the import process.
86 virtual void Cancel(); 84 virtual void Cancel();
87 85
88 protected: 86 protected:
89 virtual ~ImporterHost(); 87 virtual ~ImporterHost();
90 88
91 // Make sure that Firefox isn't running, if import browser is Firefox. Show 89 // Make sure that Firefox isn't running, if import browser is Firefox. Show
92 // to the user a dialog that notifies that is necessary to close Firefox 90 // to the user a dialog that notifies that is necessary to close Firefox
93 // prior to continue. 91 // prior to continue.
94 // |source_profile| - importer profile to import. 92 // |source_profile| - importer profile to import.
95 // |items| - specifies which data to import (bitmask of importer::ImportItem). 93 // |items| - specifies which data to import (bitmask of importer::ImportItem).
96 // |first_run| - true if this method is being called during first run.
97 void CheckForFirefoxLock(const importer::SourceProfile& source_profile, 94 void CheckForFirefoxLock(const importer::SourceProfile& source_profile,
98 uint16 items, 95 uint16 items);
99 bool first_run);
100 96
101 // Make sure BookmarkModel and TemplateURLService are loaded before import 97 // Make sure BookmarkModel and TemplateURLService are loaded before import
102 // process starts, if bookmarks and/or search engines are among the items 98 // process starts, if bookmarks and/or search engines are among the items
103 // which are to be imported. 99 // which are to be imported.
104 void CheckForLoadedModels(uint16 items); 100 void CheckForLoadedModels(uint16 items);
105 101
106 // Profile we're importing from. 102 // Profile we're importing from.
107 Profile* profile_; 103 Profile* profile_;
108 104
109 // True if we're waiting for the model to finish loading. 105 // True if we're waiting for the model to finish loading.
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 // The observer that we need to notify about changes in the import process. 162 // The observer that we need to notify about changes in the import process.
167 importer::ImporterProgressObserver* observer_; 163 importer::ImporterProgressObserver* observer_;
168 164
169 // Firefox profile lock. 165 // Firefox profile lock.
170 scoped_ptr<FirefoxProfileLock> firefox_lock_; 166 scoped_ptr<FirefoxProfileLock> firefox_lock_;
171 167
172 DISALLOW_COPY_AND_ASSIGN(ImporterHost); 168 DISALLOW_COPY_AND_ASSIGN(ImporterHost);
173 }; 169 };
174 170
175 #endif // CHROME_BROWSER_IMPORTER_IMPORTER_HOST_H_ 171 #endif // CHROME_BROWSER_IMPORTER_IMPORTER_HOST_H_
OLDNEW
« no previous file with comments | « chrome/browser/importer/ie_importer_unittest_win.cc ('k') | chrome/browser/importer/importer_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698