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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/settings/cros_settings.cc

Issue 14306004: Put Kiosk App parameters into device settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 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
« chrome/browser/chromeos/policy/proto/chrome_device_policy.proto ('K') | « chrome/browser/chromeos/policy/proto/chrome_device_policy.proto ('k') | chrome/browser/chromeos/settings/cros_settings_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/settings/cros_settings.cc
diff --git a/chrome/browser/chromeos/settings/cros_settings.cc b/chrome/browser/chromeos/settings/cros_settings.cc
index 08a68664fed981920b288ce8ed50ddbd5a551a0b..70b475e2d03913b2b7c99e90de6a3e81159e2a58 100644
--- a/chrome/browser/chromeos/settings/cros_settings.cc
+++ b/chrome/browser/chromeos/settings/cros_settings.cc
@@ -12,7 +12,6 @@
#include "base/values.h"
#include "chrome/browser/chromeos/settings/device_settings_provider.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "chrome/browser/chromeos/settings/kiosk_app_local_settings.h"
#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
#include "chrome/browser/chromeos/settings/system_settings_provider.h"
#include "chrome/common/chrome_notification_types.h"
@@ -303,8 +302,6 @@ CrosSettings::CrosSettings() {
}
// System settings are not mocked currently.
AddSettingsProvider(new SystemSettingsProvider(notify_cb));
- // Kiosk app settings are not mocked.
- AddSettingsProvider(new KioskAppLocalSettings(notify_cb));
}
CrosSettings::~CrosSettings() {
« chrome/browser/chromeos/policy/proto/chrome_device_policy.proto ('K') | « chrome/browser/chromeos/policy/proto/chrome_device_policy.proto ('k') | chrome/browser/chromeos/settings/cros_settings_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698