Commit eb4ca49e authored by stepco@chromium.org's avatar stepco@chromium.org

Remove disable-enterprise-user-reporting flag.

BUG=350242

Review URL: https://codereview.chromium.org/286093003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271460 0039d316-1c4b-4281-b951-d872f2087c98
parent 637064f4
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/location.h" #include "base/location.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
...@@ -24,7 +23,6 @@ ...@@ -24,7 +23,6 @@
#include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/common/chrome_version_info.h" #include "chrome/common/chrome_version_info.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/network/device_state.h" #include "chromeos/network/device_state.h"
#include "chromeos/network/network_handler.h" #include "chromeos/network/network_handler.h"
#include "chromeos/network/network_state_handler.h" #include "chromeos/network/network_state_handler.h"
...@@ -472,8 +470,7 @@ bool DeviceStatusCollector::GetDeviceStatus( ...@@ -472,8 +470,7 @@ bool DeviceStatusCollector::GetDeviceStatus(
if (report_network_interfaces_) if (report_network_interfaces_)
GetNetworkInterfaces(status); GetNetworkInterfaces(status);
if (report_users_ && !CommandLine::ForCurrentProcess()->HasSwitch( if (report_users_) {
chromeos::switches::kDisableEnterpriseUserReporting)) {
GetUsers(status); GetUsers(status);
} }
......
...@@ -33,10 +33,6 @@ const char kDisableBootAnimation[] = "disable-boot-animation"; ...@@ -33,10 +33,6 @@ const char kDisableBootAnimation[] = "disable-boot-animation";
// Disables the ChromeOS demo. // Disables the ChromeOS demo.
const char kDisableDemoMode[] = "disable-demo-mode"; const char kDisableDemoMode[] = "disable-demo-mode";
// Disables reporting recently logged in users for enterprise-managed devices.
const char kDisableEnterpriseUserReporting[] =
"disable-enterprise-user-reporting";
// Disable Genius App and use the original Help App instead. // Disable Genius App and use the original Help App instead.
const char kDisableGeniusApp[] = "disable-genius-app"; const char kDisableGeniusApp[] = "disable-genius-app";
......
...@@ -28,7 +28,6 @@ CHROMEOS_EXPORT extern const char kDerelictDetectionTimeout[]; ...@@ -28,7 +28,6 @@ CHROMEOS_EXPORT extern const char kDerelictDetectionTimeout[];
CHROMEOS_EXPORT extern const char kDerelictIdleTimeout[]; CHROMEOS_EXPORT extern const char kDerelictIdleTimeout[];
CHROMEOS_EXPORT extern const char kDisableBootAnimation[]; CHROMEOS_EXPORT extern const char kDisableBootAnimation[];
CHROMEOS_EXPORT extern const char kDisableDemoMode[]; CHROMEOS_EXPORT extern const char kDisableDemoMode[];
CHROMEOS_EXPORT extern const char kDisableEnterpriseUserReporting[];
CHROMEOS_EXPORT extern const char kDisableGeniusApp[]; CHROMEOS_EXPORT extern const char kDisableGeniusApp[];
CHROMEOS_EXPORT extern const char kDisableLoginAnimations[]; CHROMEOS_EXPORT extern const char kDisableLoginAnimations[];
CHROMEOS_EXPORT extern const char kDisableNetworkPortalNotification[]; CHROMEOS_EXPORT extern const char kDisableNetworkPortalNotification[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment