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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 2581353002: Use the Windows MDM API to check if the machine is being managed. (Closed)
Patch Set: Fix components tests Created 4 years 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
OLDNEW
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 1650 matching lines...) Expand 10 before | Expand all | Expand 10 after
1661 // preferences are registered, since some of the code that the importer 1661 // preferences are registered, since some of the code that the importer
1662 // touches reads preferences. 1662 // touches reads preferences.
1663 if (first_run::IsChromeFirstRun()) { 1663 if (first_run::IsChromeFirstRun()) {
1664 // By default Auto Import is performed on first run. 1664 // By default Auto Import is performed on first run.
1665 bool auto_import = true; 1665 bool auto_import = true;
1666 1666
1667 #if defined(OS_WIN) 1667 #if defined(OS_WIN)
1668 // Auto Import might be disabled via a field trial. However, this field 1668 // Auto Import might be disabled via a field trial. However, this field
1669 // trial is not intended to affect enterprise users. 1669 // trial is not intended to affect enterprise users.
1670 auto_import = 1670 auto_import =
1671 base::win::IsEnrolledToDomain() || 1671 base::win::IsEnterpriseUser() ||
1672 !base::FeatureList::IsEnabled(features::kDisableFirstRunAutoImportWin); 1672 !base::FeatureList::IsEnabled(features::kDisableFirstRunAutoImportWin);
1673 #endif // defined(OS_WIN) 1673 #endif // defined(OS_WIN)
1674 1674
1675 if (auto_import) { 1675 if (auto_import) {
1676 first_run::AutoImport(profile_, master_prefs_->homepage_defined, 1676 first_run::AutoImport(profile_, master_prefs_->homepage_defined,
1677 master_prefs_->do_import_items, 1677 master_prefs_->do_import_items,
1678 master_prefs_->dont_import_items, 1678 master_prefs_->dont_import_items,
1679 master_prefs_->import_bookmarks_path); 1679 master_prefs_->import_bookmarks_path);
1680 } 1680 }
1681 1681
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
2095 chromeos::CrosSettings::Shutdown(); 2095 chromeos::CrosSettings::Shutdown();
2096 #endif // defined(OS_CHROMEOS) 2096 #endif // defined(OS_CHROMEOS)
2097 #endif // defined(OS_ANDROID) 2097 #endif // defined(OS_ANDROID)
2098 } 2098 }
2099 2099
2100 // Public members: 2100 // Public members:
2101 2101
2102 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2102 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2103 chrome_extra_parts_.push_back(parts); 2103 chrome_extra_parts_.push_back(parts);
2104 } 2104 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698