diff options
| author | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-02 12:51:11 +0000 |
|---|---|---|
| committer | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-02 12:51:11 +0000 |
| commit | ddd98a674bc0e41df644c5c56b826246d45884a6 (patch) | |
| tree | 29e2b77d6428fb289cea2a85c3e9a6e59ae79e21 | |
| parent | 36fc4f87c6687793e849fb6d0a2a9afe4fdae3c5 (diff) | |
| download | chromium_src-ddd98a674bc0e41df644c5c56b826246d45884a6.zip chromium_src-ddd98a674bc0e41df644c5c56b826246d45884a6.tar.gz chromium_src-ddd98a674bc0e41df644c5c56b826246d45884a6.tar.bz2 | |
Merge 226203 "Removed the experimental flag for Chromecast suppo..."
> Removed the experimental flag for Chromecast support and the corresponding strings.
>
> BUG=299971
>
> NOTRY=true
>
> Review URL: https://codereview.chromium.org/25266002
TBR=maybelle@chromium.org
Review URL: https://codereview.chromium.org/25717002
git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226458 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 8 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 9 |
2 files changed, 0 insertions, 17 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index a2fd244..479c166 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6771,14 +6771,6 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_DESCRIPTION" desc="Description for the flag to disable sync of user account image."> Disables sync of user account image between different ChromeOS devices. </message> - <if expr="is_android"> - <message name="IDS_FLAGS_ENABLE_CAST_NAME" desc="Name of the flag to enable Chromecast support."> - Enable Chromecast support - </message> - <message name="IDS_FLAGS_ENABLE_CAST_DESCRIPTION" desc="Description for the flag to enable playing videos remotely on Chromecast."> - Enable playing videos remotely on Chromecast. - </message> - </if> <!-- Crashes --> <message name="IDS_CRASHES_TITLE" desc="Title for the chrome://crashes page."> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 0e5df91..7da43e8 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -1767,15 +1767,6 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE("") #endif }, -#if defined(OS_ANDROID) - { - "enable-cast", - IDS_FLAGS_ENABLE_CAST_NAME, - IDS_FLAGS_ENABLE_CAST_DESCRIPTION, - kOsAndroid, - SINGLE_VALUE_TYPE(switches::kEnableCast) - }, -#endif }; const Experiment* experiments = kExperiments; |