Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 23 insertions, 0 deletions

diff --git a/chrome/browser/chromeos/cros_settings_provider.cc b/chrome/browser/chromeos/cros_settings_provider.cc
new file mode 100644
index 0000000..1bdd78b
--- /dev/null
+++ b/chrome/browser/chromeos/cros_settings_provider.cc
@@ -0,0 +1,23 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/chromeos/cros_settings_provider.h"
+
+#include "base/command_line.h"
+#include "base/logging.h"
+#include "chrome/common/chrome_switches.h"
+
+namespace chromeos {
+
+void CrosSettingsProvider::Set(const std::string& path, Value* value) {
+  // We don't allow changing any of the cros settings in the guest mode.
+  // It should not reach here from UI in the guest mode, but just in case.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
+    LOG(ERROR) << "Ignoring the guest request to change: " << path;
+    return;
+  }
+  DoSet(path, value);
+}
+
+};  // namespace chromeos