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

Unified Diff: chrome/browser/chromeos/system/device_disabling_manager.cc

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/system/device_disabling_manager.cc
diff --git a/chrome/browser/chromeos/system/device_disabling_manager.cc b/chrome/browser/chromeos/system/device_disabling_manager.cc
index 165a8f4fcaa7d2c6f0ebbe17871049719ebe7a1b..3b8787194affd2b51f08404862565d158794c395 100644
--- a/chrome/browser/chromeos/system/device_disabling_manager.cc
+++ b/chrome/browser/chromeos/system/device_disabling_manager.cc
@@ -58,7 +58,7 @@ void DeviceDisablingManager::RemoveObserver(Observer* observer) {
}
void DeviceDisablingManager::Init() {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableDeviceDisabling)) {
// If device disabling is turned off by flags, do not start monitoring cros
// settings.
@@ -91,7 +91,7 @@ void DeviceDisablingManager::CacheDisabledMessageAndNotify(
void DeviceDisablingManager::CheckWhetherDeviceDisabledDuringOOBE(
const DeviceDisabledCheckCallback& callback) {
if (policy::GetRestoreMode() != policy::RESTORE_MODE_DISABLED ||
- CommandLine::ForCurrentProcess()->HasSwitch(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableDeviceDisabling)) {
// Indicate that the device is not disabled if it is not marked as such in
// local state or device disabling has been turned off by flag.
@@ -150,10 +150,11 @@ void DeviceDisablingManager::CheckWhetherDeviceDisabledDuringOOBE(
bool DeviceDisablingManager::HonorDeviceDisablingDuringNormalOperation() {
// Device disabling should be honored when the device is enterprise managed
// and device disabling has not been turned off by flag.
- return g_browser_process->platform_part()->
- browser_policy_connector_chromeos()->IsEnterpriseManaged() &&
- !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableDeviceDisabling);
+ return g_browser_process->platform_part()
+ ->browser_policy_connector_chromeos()
+ ->IsEnterpriseManaged() &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableDeviceDisabling);
}
void DeviceDisablingManager::UpdateFromCrosSettings() {

Powered by Google App Engine
This is Rietveld 408576698