diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 22:25:00 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 22:25:00 +0000 |
| commit | 40ed871aeb4b91fda42858874bf910d78122fcca (patch) | |
| tree | 43b2a9c3b2bd4abc3bb260d73fe5d13746398821 | |
| parent | c0af4e53c47dc5aad8dd5ac171f6130fdf41267a (diff) | |
| download | chromium_src-40ed871aeb4b91fda42858874bf910d78122fcca.zip chromium_src-40ed871aeb4b91fda42858874bf910d78122fcca.tar.gz chromium_src-40ed871aeb4b91fda42858874bf910d78122fcca.tar.bz2 | |
Merge 164862 - [Chrome OS ECHO]: In Kiosk/Retail mode return an empty code
This effectively disables the Chrome OS registration API while
running in Kiosk/Retail mode.
BUG=chromium-os:35832
TEST=manually verified with and without --enable-kiosk-mode flag.
Review URL: https://chromiumcodereview.appspot.com/11336026
TBR=gauravsh@chromium.org
Review URL: https://codereview.chromium.org/11364187
git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166997 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/extensions/echo_private_api.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/extensions/echo_private_api.cc b/chrome/browser/chromeos/extensions/echo_private_api.cc index 9c1729d..c881138 100644 --- a/chrome/browser/chromeos/extensions/echo_private_api.cc +++ b/chrome/browser/chromeos/extensions/echo_private_api.cc @@ -8,6 +8,7 @@ #include "base/compiler_specific.h" #include "base/values.h" +#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" #include "chrome/browser/chromeos/system/statistics_provider.h" #include "chrome/common/extensions/extension.h" @@ -25,10 +26,14 @@ base::Value* GetValueForRegistrationCodeType(std::string& type) { chromeos::system::StatisticsProvider* provider = chromeos::system::StatisticsProvider::GetInstance(); std::string result; - if (type == kCouponType) - provider->GetMachineStatistic(kCouponCodeKey, &result); - else if (type == kGroupType) - provider->GetMachineStatistic(kGroupCodeKey, &result); + if (!chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) { + // In Kiosk mode, we effectively disable the registration API + // by always returning an empty code. + if (type == kCouponType) + provider->GetMachineStatistic(kCouponCodeKey, &result); + else if (type == kGroupType) + provider->GetMachineStatistic(kGroupCodeKey, &result); + } return Value::CreateStringValue(result); } |