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

Unified Diff: chrome/browser/chromeos/extensions/echo_private_api.cc

Issue 608283003: Remove retail mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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/extensions/echo_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/echo_private_api.cc b/chrome/browser/chromeos/extensions/echo_private_api.cc
index 8b07620272e40ab2b73a21987cfbdb4059aefc63..9943dbda7901dc2fd0c7ca93cc8099f5f2d4b8a9 100644
--- a/chrome/browser/chromeos/extensions/echo_private_api.cc
+++ b/chrome/browser/chromeos/extensions/echo_private_api.cc
@@ -17,7 +17,6 @@
#include "base/time/time.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/ui/echo_dialog_view.h"
#include "chrome/browser/ui/browser.h"
@@ -61,12 +60,6 @@ EchoPrivateGetRegistrationCodeFunction::
void EchoPrivateGetRegistrationCodeFunction::GetRegistrationCode(
const std::string& type) {
- if (!chromeos::KioskModeSettings::Get()->is_initialized()) {
- chromeos::KioskModeSettings::Get()->Initialize(base::Bind(
- &EchoPrivateGetRegistrationCodeFunction::GetRegistrationCode,
- this, type));
- return;
- }
// Possible ECHO code type and corresponding key name in StatisticsProvider.
const std::string kCouponType = "COUPON_CODE";
const std::string kGroupType = "GROUP_CODE";
@@ -74,16 +67,12 @@ void EchoPrivateGetRegistrationCodeFunction::GetRegistrationCode(
chromeos::system::StatisticsProvider* provider =
chromeos::system::StatisticsProvider::GetInstance();
std::string 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(chromeos::system::kOffersCouponCodeKey,
- &result);
- } else if (type == kGroupType) {
- provider->GetMachineStatistic(chromeos::system::kOffersGroupCodeKey,
- &result);
- }
+ if (type == kCouponType) {
+ provider->GetMachineStatistic(chromeos::system::kOffersCouponCodeKey,
+ &result);
+ } else if (type == kGroupType) {
+ provider->GetMachineStatistic(chromeos::system::kOffersGroupCodeKey,
+ &result);
}
results_ = echo_api::GetRegistrationCode::Results::Create(result);

Powered by Google App Engine
This is Rietveld 408576698