diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 22:43:59 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 22:43:59 +0000 |
| commit | d9959986264ae4175895781d834d0ff4413b5436 (patch) | |
| tree | 9fd0d751eef1215293be573f64027ef2fed82768 /chrome | |
| parent | 03f92bb25184f13f4af0a88d0953ed482a64ea21 (diff) | |
| download | chromium_src-d9959986264ae4175895781d834d0ff4413b5436.zip chromium_src-d9959986264ae4175895781d834d0ff4413b5436.tar.gz chromium_src-d9959986264ae4175895781d834d0ff4413b5436.tar.bz2 | |
Cleanup about:flags for remoting and enable for all platforms.
BUG=none
TEST=compiled and viewed under linux.
Review URL: http://codereview.chromium.org/6222004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 7 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 13 |
2 files changed, 4 insertions, 16 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e4b6880..aec5919 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -3961,11 +3961,8 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_REMOTING_NAME" desc="Description of the 'Remoting' lab."> Remoting </message> - <message name="IDS_FLAGS_REMOTING_CLIENT_DESCRIPTION" desc="Description of the 'Remoting' client lab."> - Enable Remoting Client support. - </message> - <message name="IDS_FLAGS_REMOTING_HOST_DESCRIPTION" desc="Description of the 'Remoting' host lab."> - Enable Remoting Host support. + <message name="IDS_FLAGS_REMOTING_DESCRIPTION" desc="Description of the 'Remoting' client lab."> + Enable the UI plus backing code for the Remoting serivce process, and client plugin. Warning: This is currently for developer testing only. Unless you are on the dev team and whitelisted, nothing in the enabled UI will work. </message> <message name="IDS_FLAGS_ENABLE_NACL_NAME" desc="Description of the 'Enable Native Client' lab."> Native Client diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 9655538..351eaa5 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -124,17 +124,8 @@ const Experiment kExperiments[] = { { "remoting", // FLAGS:RECORD_UMA IDS_FLAGS_REMOTING_NAME, -#if defined(OS_WIN) - // Windows only supports host functionality at the moment. - IDS_FLAGS_REMOTING_HOST_DESCRIPTION, -#elif defined(OS_LINUX) // Also true for CrOS. - // Linux only supports client functionality at the moment. - IDS_FLAGS_REMOTING_CLIENT_DESCRIPTION, -#else - // On other platforms, this lab isn't available at all. - 0, -#endif - kOsWin | kOsLinux | kOsCrOS, + IDS_FLAGS_REMOTING_DESCRIPTION, + kOsAll, SINGLE_VALUE_TYPE(switches::kEnableRemoting) }, { |