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

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: Address review comments Created 3 years, 10 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 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 1674 matching lines...) Expand 10 before | Expand all | Expand 10 after
1685 // preferences are registered, since some of the code that the importer 1685 // preferences are registered, since some of the code that the importer
1686 // touches reads preferences. 1686 // touches reads preferences.
1687 if (first_run::IsChromeFirstRun()) { 1687 if (first_run::IsChromeFirstRun()) {
1688 // By default Auto Import is performed on first run. 1688 // By default Auto Import is performed on first run.
1689 bool auto_import = true; 1689 bool auto_import = true;
1690 1690
1691 #if defined(OS_WIN) 1691 #if defined(OS_WIN)
1692 // Auto Import might be disabled via a field trial. However, this field 1692 // Auto Import might be disabled via a field trial. However, this field
1693 // trial is not intended to affect enterprise users. 1693 // trial is not intended to affect enterprise users.
1694 auto_import = 1694 auto_import =
1695 base::win::IsEnrolledToDomain() || 1695 base::win::IsEnterpriseManaged() ||
1696 !base::FeatureList::IsEnabled(features::kDisableFirstRunAutoImportWin); 1696 !base::FeatureList::IsEnabled(features::kDisableFirstRunAutoImportWin);
1697 #endif // defined(OS_WIN) 1697 #endif // defined(OS_WIN)
1698 1698
1699 if (auto_import) { 1699 if (auto_import) {
1700 first_run::AutoImport(profile_, master_prefs_->homepage_defined, 1700 first_run::AutoImport(profile_, master_prefs_->homepage_defined,
1701 master_prefs_->do_import_items, 1701 master_prefs_->do_import_items,
1702 master_prefs_->dont_import_items, 1702 master_prefs_->dont_import_items,
1703 master_prefs_->import_bookmarks_path); 1703 master_prefs_->import_bookmarks_path);
1704 } 1704 }
1705 1705
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
2117 chromeos::CrosSettings::Shutdown(); 2117 chromeos::CrosSettings::Shutdown();
2118 #endif // defined(OS_CHROMEOS) 2118 #endif // defined(OS_CHROMEOS)
2119 #endif // defined(OS_ANDROID) 2119 #endif // defined(OS_ANDROID)
2120 } 2120 }
2121 2121
2122 // Public members: 2122 // Public members:
2123 2123
2124 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2124 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2125 chrome_extra_parts_.push_back(parts); 2125 chrome_extra_parts_.push_back(parts);
2126 } 2126 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698