diff options
| author | dhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 17:34:51 +0000 |
|---|---|---|
| committer | dhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 17:34:51 +0000 |
| commit | 5f7145d2eadcbb5faa3210d5e346018d0be6ffb6 (patch) | |
| tree | 42c4bafe8b9061a3b0106028b94891377ccc904a /chrome/browser/dom_ui | |
| parent | 1c8722a5236242e014eb2c03dac103ef35b7f223 (diff) | |
| download | chromium_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/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/core_options_handler.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/options_ui.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/dom_ui/core_options_handler.cc b/chrome/browser/dom_ui/core_options_handler.cc index 5853d4f..948a4fc 100644 --- a/chrome/browser/dom_ui/core_options_handler.cc +++ b/chrome/browser/dom_ui/core_options_handler.cc @@ -45,8 +45,6 @@ void CoreOptionsHandler::GetLocalizedValues( l10n_util::GetString(IDS_PRODUCT_NAME))); #if defined(OS_CHROMEOS) - localized_strings->SetString(L"systemPage", - l10n_util::GetString(IDS_OPTIONS_SYSTEM_TAB_LABEL)); localized_strings->SetString(L"internetPage", l10n_util::GetString(IDS_OPTIONS_INTERNET_TAB_LABEL)); #endif diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc index 19897d8..9f48102 100644 --- a/chrome/browser/dom_ui/options_ui.cc +++ b/chrome/browser/dom_ui/options_ui.cc @@ -36,6 +36,7 @@ #include "grit/theme_resources.h" #if defined(OS_CHROMEOS) +#include "chrome/browser/chromeos/dom_ui/labs_handler.h" #include "chrome/browser/chromeos/dom_ui/system_options_handler.h" #endif @@ -101,6 +102,7 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) { AddOptionsPageUIHandler(localized_strings, new CoreOptionsHandler()); #if defined(OS_CHROMEOS) AddOptionsPageUIHandler(localized_strings, new SystemOptionsHandler()); + AddOptionsPageUIHandler(localized_strings, new LabsHandler()); #endif // |localized_strings| ownership is taken over by this constructor. |