| Index: chrome/browser/chromeos/policy/device_status_collector.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_status_collector.cc b/chrome/browser/chromeos/policy/device_status_collector.cc
|
| index 89e46c92ea4f5f23b1f69c72222b43f467f70ca3..e2a7a4c7998f922f87bb911d038eb3d829e11210 100644
|
| --- a/chrome/browser/chromeos/policy/device_status_collector.cc
|
| +++ b/chrome/browser/chromeos/policy/device_status_collector.cc
|
| @@ -381,6 +381,12 @@ void DeviceStatusCollector::IdleStateCallback(ui::IdleState state) {
|
| last_idle_check_ = now;
|
| }
|
|
|
| +bool DeviceStatusCollector::IsAutoLaunchedKioskSession() {
|
| + // TODO(atwilson): Determine if the currently active session is an
|
| + // autolaunched kiosk session (http://crbug.com/452968).
|
| + return false;
|
| +}
|
| +
|
| void DeviceStatusCollector::SampleHardwareStatus() {
|
| // If hardware reporting has been disabled, do nothing here.
|
| if (!report_hardware_status_)
|
| @@ -591,6 +597,10 @@ void DeviceStatusCollector::GetNetworkInterfaces(
|
| interface->set_device_path((*device)->path());
|
| }
|
|
|
| + // Don't write any network state if we aren't in a kiosk session.
|
| + if (!IsAutoLaunchedKioskSession())
|
| + return;
|
| +
|
| // Walk the various networks and store their state in the status report.
|
| chromeos::NetworkStateHandler::NetworkStateList state_list;
|
| network_state_handler->GetNetworkListByType(
|
|
|