| Index: chrome/browser/ui/webui/options/browser_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| index e7197633088b3bcf2e0877c5aa98af6322107c59..bea493bb373afe68739c021f964b5762f51e3b85 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -112,6 +112,7 @@
|
| #include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| #include "chrome/browser/chromeos/reset/metrics.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| +#include "chrome/browser/chromeos/settings/device_settings_service.h"
|
| #include "chrome/browser/chromeos/system/timezone_util.h"
|
| #include "chrome/browser/policy/profile_policy_connector.h"
|
| #include "chrome/browser/policy/profile_policy_connector_factory.h"
|
| @@ -122,6 +123,7 @@
|
| #include "components/policy/core/common/policy_namespace.h"
|
| #include "components/policy/core/common/policy_service.h"
|
| #include "policy/policy_constants.h"
|
| +#include "policy/proto/device_management_backend.pb.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| @@ -144,6 +146,8 @@ using content::Referrer;
|
| using extensions::Extension;
|
| using extensions::ExtensionRegistry;
|
|
|
| +namespace em = enterprise_management;
|
| +
|
| namespace {
|
|
|
| #if defined(OS_WIN)
|
| @@ -612,6 +616,13 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| CommandLine::ForCurrentProcess()->HasSwitch(
|
| chromeos::switches::kEnableConsumerManagement));
|
|
|
| + const em::PolicyData* policy_data =
|
| + chromeos::DeviceSettingsService::Get()->policy_data();
|
| + values->SetBoolean(
|
| + "consumerManagementEnrolled",
|
| + policy_data &&
|
| + policy_data->management_mode() == em::PolicyData::CONSUMER_MANAGED);
|
| +
|
| RegisterTitle(values, "thirdPartyImeConfirmOverlay",
|
| IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_TITLE);
|
| #endif
|
|
|