Index: chrome/browser/first_run.cc |
diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc |
index 6291585f7c3d4307488e5edd4815af0023bc9dd3..3ac9d8216fb52fc97ea2429e000feacb7c4a57d3 100644 |
--- a/chrome/browser/first_run.cc |
+++ b/chrome/browser/first_run.cc |
@@ -28,6 +28,7 @@ |
#include "chrome/browser/importer/importer.h" |
#include "chrome/browser/profile.h" |
#include "chrome/browser/profile_manager.h" |
+#include "chrome/browser/shell_integration.h" |
#include "chrome/browser/views/first_run_view.h" |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_paths.h" |
@@ -287,6 +288,8 @@ bool FirstRun::ProcessMasterPreferences( |
import_items += SEARCH_ENGINES; |
if (parse_result & installer_util::MASTER_PROFILE_IMPORT_HISTORY) |
import_items += HISTORY; |
+ if (parse_result & installer_util::MASTER_PROFILE_IMPORT_BOOKMARKS) |
+ import_items += FAVORITES; |
if (import_items) { |
// There is something to import from the default browser. This launches |
@@ -299,6 +302,10 @@ bool FirstRun::ProcessMasterPreferences( |
} |
} |
+ if (parse_result & |
+ installer_util::MASTER_PROFILE_MAKE_CHROME_DEFAULT_FOR_USER) |
+ ShellIntegration::SetAsDefaultBrowser(); |
+ |
return false; |
} |