diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-25 14:08:56 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-25 14:08:56 +0000 |
| commit | 52fa2d51ad0335f29e471ff4cafb9c1347e7ea14 (patch) | |
| tree | 461cc6f61d2f291411c78243335334a1a2cb3c76 /chrome/browser | |
| parent | fd3ad516a833d0cdb3f39dad28b03526d53e3ddd (diff) | |
| download | chromium_src-52fa2d51ad0335f29e471ff4cafb9c1347e7ea14.zip chromium_src-52fa2d51ad0335f29e471ff4cafb9c1347e7ea14.tar.gz chromium_src-52fa2d51ad0335f29e471ff4cafb9c1347e7ea14.tar.bz2 | |
Add remoting to about:labs.
BUG=55676
TEST=Go to about:labs and make sure you see a section for Remoting.
Review URL: http://codereview.chromium.org/3422010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chromeos/dom_ui/labs_handler.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/chromeos/dom_ui/labs_handler.h | 1 | ||||
| -rw-r--r-- | chrome/browser/labs.cc | 16 |
3 files changed, 17 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/dom_ui/labs_handler.cc b/chrome/browser/chromeos/dom_ui/labs_handler.cc index 19b5561..7f45611 100644 --- a/chrome/browser/chromeos/dom_ui/labs_handler.cc +++ b/chrome/browser/chromeos/dom_ui/labs_handler.cc @@ -5,18 +5,8 @@ #include "chrome/browser/chromeos/dom_ui/labs_handler.h" #include "app/l10n_util.h" -#include "base/basictypes.h" -#include "base/callback.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() { } @@ -30,6 +20,7 @@ void LabsHandler::GetLocalizedValues( // Labs page - ChromeOS localized_strings->SetString("labsPage", l10n_util::GetStringUTF16(IDS_OPTIONS_LABS_TAB_LABEL)); + localized_strings->SetString("mediaplayer_title", l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_MEDIAPLAYER)); localized_strings->SetString("mediaplayer", diff --git a/chrome/browser/chromeos/dom_ui/labs_handler.h b/chrome/browser/chromeos/dom_ui/labs_handler.h index df2dab3..3fc1121 100644 --- a/chrome/browser/chromeos/dom_ui/labs_handler.h +++ b/chrome/browser/chromeos/dom_ui/labs_handler.h @@ -18,7 +18,6 @@ class LabsHandler : public OptionsPageUIHandler { virtual void GetLocalizedValues(DictionaryValue* localized_strings); private: - DISALLOW_COPY_AND_ASSIGN(LabsHandler); }; diff --git a/chrome/browser/labs.cc b/chrome/browser/labs.cc index 75ecc44..e533c30 100644 --- a/chrome/browser/labs.cc +++ b/chrome/browser/labs.cc @@ -81,6 +81,22 @@ const Experiment kExperiments[] = { kOsWin, switches::kEnableMatchPreview }, + { + "remoting", // Do not change; see above. + IDS_LABS_REMOTING_NAME, +#if defined(OS_WINDOWS) + // Windows only supports host functionality at the moment. + IDS_LABS_REMOTING_HOST_DESCRIPTION, +#elif defined(OS_LINUX) + // Linux only supports client functionality at the moment. + IDS_LABS_REMOTING_CLIENT_DESCRIPTION, +#else + // On other platforms, this lab isn't available at all + "", +#endif + kOsWin | kOsLinux, + switches::kEnableRemoting + }, }; // Extracts the list of enabled lab experiments from a profile and stores them |