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

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

Powered by Google App Engine
This is Rietveld 408576698