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

Unified Diff: chrome/browser/chromeos/policy/auto_enrollment_client.cc

Issue 14820030: Move Chrome OS switches to chromeos/chromeos_switches.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/net/network_portal_detector.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/auto_enrollment_client.cc
diff --git a/chrome/browser/chromeos/policy/auto_enrollment_client.cc b/chrome/browser/chromeos/policy/auto_enrollment_client.cc
index f63b35eb3f043fed82817478586436d1f6bf3945..02f309fdf7255e2b620bf85e197168220426f50b 100644
--- a/chrome/browser/chromeos/policy/auto_enrollment_client.cc
+++ b/chrome/browser/chromeos/policy/auto_enrollment_client.cc
@@ -19,8 +19,8 @@
#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
#include "chrome/browser/policy/browser_policy_connector.h"
#include "chrome/browser/policy/cloud/device_management_service.h"
-#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/chromeos_switches.h"
#include "crypto/sha2.h"
namespace em = enterprise_management;
@@ -109,9 +109,10 @@ void AutoEnrollmentClient::RegisterPrefs(PrefRegistrySimple* registry) {
// static
bool AutoEnrollmentClient::IsDisabled() {
CommandLine* command_line = CommandLine::ForCurrentProcess();
- return
- !command_line->HasSwitch(switches::kEnterpriseEnrollmentInitialModulus) &&
- !command_line->HasSwitch(switches::kEnterpriseEnrollmentModulusLimit);
+ return !command_line->HasSwitch(
+ chromeos::switches::kEnterpriseEnrollmentInitialModulus) &&
+ !command_line->HasSwitch(
+ chromeos::switches::kEnterpriseEnrollmentModulusLimit);
}
// static
@@ -130,9 +131,9 @@ AutoEnrollmentClient* AutoEnrollmentClient::Create(
}
int power_initial = GetSanitizedArg(
- switches::kEnterpriseEnrollmentInitialModulus);
+ chromeos::switches::kEnterpriseEnrollmentInitialModulus);
int power_limit = GetSanitizedArg(
- switches::kEnterpriseEnrollmentModulusLimit);
+ chromeos::switches::kEnterpriseEnrollmentModulusLimit);
if (power_initial > power_limit) {
LOG(ERROR) << "Initial auto-enrollment modulus is larger than the limit, "
<< "clamping to the limit.";
« no previous file with comments | « chrome/browser/chromeos/net/network_portal_detector.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698