Chromium Code Reviews| Index: chrome/browser/chrome_browser_main.cc |
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
| index 262d91c8b06ff3eeefc1474964e5284c8d531fe5..61c7a09d317349455e40225ac1aa5055c909e6af 100644 |
| --- a/chrome/browser/chrome_browser_main.cc |
| +++ b/chrome/browser/chrome_browser_main.cc |
| @@ -33,6 +33,7 @@ |
| #include "base/strings/string_number_conversions.h" |
| #include "base/strings/string_piece.h" |
| #include "base/strings/string_split.h" |
| +#include "base/strings/string_util.h" |
| #include "base/strings/sys_string_conversions.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "base/sys_info.h" |
| @@ -205,6 +206,7 @@ |
| #if defined(OS_WIN) |
| #include "base/trace_event/trace_event_etw_export_win.h" |
| +#include "base/win/win_util.h" |
| #include "base/win/windows_version.h" |
| #include "chrome/app/file_pre_reader_win.h" |
| #include "chrome/browser/chrome_browser_main_win.h" |
| @@ -1798,11 +1800,16 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { |
| // preferences are registered, since some of the code that the importer |
| // touches reads preferences. |
| if (first_run::IsChromeFirstRun()) { |
| - first_run::AutoImport(profile_, |
| - master_prefs_->homepage_defined, |
| - master_prefs_->do_import_items, |
| - master_prefs_->dont_import_items, |
| - master_prefs_->import_bookmarks_path); |
| + // Field trial kDisableFirstRunAutoImport is designed to turn off the |
| + // Auto Import feature for Windows users (on first run). |
| + // The feature keeps running for enterprise. |
|
Ilya Sherman
2016/08/23 21:05:33
nit: I'd phrase this as something like:
"Auto Imp
gcomanici
2016/08/26 19:02:17
Done.
|
| + if (base::win::IsEnrolledToDomain() || |
|
Ilya Sherman
2016/08/23 21:05:33
Hmm, I just noticed that you're calling a "base::w
gcomanici
2016/08/26 19:02:17
From what I gather in BUG=555550, the trial is int
|
| + !base::FeatureList::IsEnabled(features::kDisableFirstRunAutoImport)) { |
| + first_run::AutoImport(profile_, master_prefs_->homepage_defined, |
| + master_prefs_->do_import_items, |
| + master_prefs_->dont_import_items, |
| + master_prefs_->import_bookmarks_path); |
| + } |
| // Note: this can pop the first run consent dialog on linux. |
| first_run::DoPostImportTasks(profile_, |