summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authordhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 17:34:51 +0000
committerdhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 17:34:51 +0000
commit5f7145d2eadcbb5faa3210d5e346018d0be6ffb6 (patch)
tree42c4bafe8b9061a3b0106028b94891377ccc904a /chrome/browser/chromeos
parent1c8722a5236242e014eb2c03dac103ef35b7f223 (diff)
downloadchromium_src-5f7145d2eadcbb5faa3210d5e346018d0be6ffb6.zip
chromium_src-5f7145d2eadcbb5faa3210d5e346018d0be6ffb6.tar.gz
chromium_src-5f7145d2eadcbb5faa3210d5e346018d0be6ffb6.tar.bz2
Adding labs to the chromeos options page
Review URL: http://codereview.chromium.org/2800035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/dom_ui/labs_handler.cc44
-rw-r--r--chrome/browser/chromeos/dom_ui/labs_handler.h26
-rw-r--r--chrome/browser/chromeos/dom_ui/system_options_handler.cc2
3 files changed, 72 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/dom_ui/labs_handler.cc b/chrome/browser/chromeos/dom_ui/labs_handler.cc
new file mode 100644
index 0000000..d6ecee0
--- /dev/null
+++ b/chrome/browser/chromeos/dom_ui/labs_handler.cc
@@ -0,0 +1,44 @@
+// 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/dom_ui/labs_handler.h"
+
+#include "app/l10n_util.h"
+#include "app/resource_bundle.h"
+#include "base/basictypes.h"
+#include "base/callback.h"
+#include "base/i18n/time_formatting.h"
+#include "base/stl_util-inl.h"
+#include "base/time.h"
+#include "base/utf_string_conversions.h"
+#include "base/values.h"
+#include "chrome/common/notification_service.h"
+#include "grit/browser_resources.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+#include "grit/locale_settings.h"
+#include "grit/theme_resources.h"
+
+LabsHandler::LabsHandler() {
+}
+
+LabsHandler::~LabsHandler() {
+}
+
+void LabsHandler::GetLocalizedValues(
+ DictionaryValue* localized_strings) {
+ DCHECK(localized_strings);
+ // Labs page - ChromeOS
+ localized_strings->SetString(L"labsPage",
+ l10n_util::GetString(IDS_OPTIONS_LABS_TAB_LABEL));
+ localized_strings->SetString(L"mediaplayer_title",
+ l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_MEDIAPLAYER));
+ localized_strings->SetString(L"mediaplayer",
+ l10n_util::GetString(IDS_OPTIONS_SETTINGS_MEDIAPLAYER_DESCRIPTION));
+
+ localized_strings->SetString(L"advanced_file_title",
+ l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_ADVANCEDFS));
+ localized_strings->SetString(L"advanced_filesystem",
+ l10n_util::GetString(IDS_OPTIONS_SETTINGS_ADVANCEDFS_DESCRIPTION));
+}
diff --git a/chrome/browser/chromeos/dom_ui/labs_handler.h b/chrome/browser/chromeos/dom_ui/labs_handler.h
new file mode 100644
index 0000000..5c217bb
--- /dev/null
+++ b/chrome/browser/chromeos/dom_ui/labs_handler.h
@@ -0,0 +1,26 @@
+// 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.
+
+#ifndef CHROME_BROWSER_CHROMEOS_DOM_UI_LABS_HANDLER_H_
+#define CHROME_BROWSER_CHROMEOS_DOM_UI_LABS_HANDLER_H_
+
+#include <string>
+
+#include "chrome/browser/dom_ui/options_ui.h"
+
+// ChromeOS labs options page UI handler.
+class LabsHandler : public OptionsPageUIHandler {
+ public:
+ LabsHandler();
+ virtual ~LabsHandler();
+
+ // OptionsUIHandler implementation.
+ virtual void GetLocalizedValues(DictionaryValue* localized_strings);
+
+ private:
+
+ DISALLOW_COPY_AND_ASSIGN(LabsHandler);
+};
+
+#endif // CHROME_BROWSER_CHROMEOS_DOM_UI_LABS_HANDLER_H_
diff --git a/chrome/browser/chromeos/dom_ui/system_options_handler.cc b/chrome/browser/chromeos/dom_ui/system_options_handler.cc
index 4d16972..fed9222 100644
--- a/chrome/browser/chromeos/dom_ui/system_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/system_options_handler.cc
@@ -69,6 +69,8 @@ void SystemOptionsHandler::GetLocalizedValues(
DictionaryValue* localized_strings) {
DCHECK(localized_strings);
// System page - ChromeOS
+ localized_strings->SetString(L"systemPage",
+ l10n_util::GetString(IDS_OPTIONS_SYSTEM_TAB_LABEL));
localized_strings->SetString(L"datetime_title",
l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME));
localized_strings->SetString(L"timezone",