| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "chrome/browser/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1678 // preferences are registered, since some of the code that the importer | 1678 // preferences are registered, since some of the code that the importer |
| 1679 // touches reads preferences. | 1679 // touches reads preferences. |
| 1680 if (first_run::IsChromeFirstRun()) { | 1680 if (first_run::IsChromeFirstRun()) { |
| 1681 // By default Auto Import is performed on first run. | 1681 // By default Auto Import is performed on first run. |
| 1682 bool auto_import = true; | 1682 bool auto_import = true; |
| 1683 | 1683 |
| 1684 #if defined(OS_WIN) | 1684 #if defined(OS_WIN) |
| 1685 // Auto Import might be disabled via a field trial. However, this field | 1685 // Auto Import might be disabled via a field trial. However, this field |
| 1686 // trial is not intended to affect enterprise users. | 1686 // trial is not intended to affect enterprise users. |
| 1687 auto_import = | 1687 auto_import = |
| 1688 base::win::IsEnrolledToDomain() || | 1688 base::win::IsEnterpriseUser() || |
| 1689 !base::FeatureList::IsEnabled(features::kDisableFirstRunAutoImportWin); | 1689 !base::FeatureList::IsEnabled(features::kDisableFirstRunAutoImportWin); |
| 1690 #endif // defined(OS_WIN) | 1690 #endif // defined(OS_WIN) |
| 1691 | 1691 |
| 1692 if (auto_import) { | 1692 if (auto_import) { |
| 1693 first_run::AutoImport(profile_, master_prefs_->homepage_defined, | 1693 first_run::AutoImport(profile_, master_prefs_->homepage_defined, |
| 1694 master_prefs_->do_import_items, | 1694 master_prefs_->do_import_items, |
| 1695 master_prefs_->dont_import_items, | 1695 master_prefs_->dont_import_items, |
| 1696 master_prefs_->import_bookmarks_path); | 1696 master_prefs_->import_bookmarks_path); |
| 1697 } | 1697 } |
| 1698 | 1698 |
| (...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2110 chromeos::CrosSettings::Shutdown(); | 2110 chromeos::CrosSettings::Shutdown(); |
| 2111 #endif // defined(OS_CHROMEOS) | 2111 #endif // defined(OS_CHROMEOS) |
| 2112 #endif // defined(OS_ANDROID) | 2112 #endif // defined(OS_ANDROID) |
| 2113 } | 2113 } |
| 2114 | 2114 |
| 2115 // Public members: | 2115 // Public members: |
| 2116 | 2116 |
| 2117 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2117 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2118 chrome_extra_parts_.push_back(parts); | 2118 chrome_extra_parts_.push_back(parts); |
| 2119 } | 2119 } |
| OLD | NEW |