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

Unified Diff: chrome/browser/importer/importer_list.cc

Issue 4206002: Firefox import broken for first run on Mac (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
« no previous file with comments | « chrome/browser/cocoa/search_engine_dialog_controller.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/importer_list.cc
===================================================================
--- chrome/browser/importer/importer_list.cc (revision 64076)
+++ chrome/browser/importer/importer_list.cc (working copy)
@@ -35,9 +35,9 @@
}
void ImporterList::DetectSourceProfiles() {
+// The first run import will automatically take settings from the first
+// profile detected, which should be the user's current default.
#if defined(OS_WIN)
- // The order in which detect is called determines the order
- // in which the options appear in the dropdown combo-box
if (ShellIntegration::IsFirefoxDefaultBrowser()) {
DetectFirefoxProfiles();
DetectIEProfiles();
@@ -47,10 +47,15 @@
}
// TODO(brg) : Current UI requires win_util.
DetectGoogleToolbarProfiles();
+#elif defined(OS_MACOSX)
+ if (ShellIntegration::IsFirefoxDefaultBrowser()) {
+ DetectFirefoxProfiles();
+ DetectSafariProfiles();
+ } else {
+ DetectSafariProfiles();
+ DetectFirefoxProfiles();
+ }
#else
-#if defined(OS_MACOSX)
- DetectSafariProfiles();
-#endif
DetectFirefoxProfiles();
#endif
}
« no previous file with comments | « chrome/browser/cocoa/search_engine_dialog_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698