diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 11 | ||||
| -rw-r--r-- | chrome/test/ui/ppapi_uitest.cc | 5 |
3 files changed, 0 insertions, 22 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 6419e88..46a45af 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4241,12 +4241,6 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_WEBGL_DESCRIPTION" desc="Description of the 'WebGL' lab."> Enables canvas elements to use 3D graphics via the WebGL API. </message> - <message name="IDS_FLAGS_P2P_API_NAME" desc="Name of the 'P2P API' lab."> - P2P API - </message> - <message name="IDS_FLAGS_P2P_API_DESCRIPTION" desc="Description of the 'P2P API' lab."> - Enables P2P Pepper API and P2P JavaScript API. The API is under development, and doesn't work yet. - </message> <message name="IDS_FLAGS_PRINT_PREVIEW_NAME" desc="Name of the 'Print Preview' lab."> Print Preview </message> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index ebec71a..0ec0912 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -245,17 +245,6 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(switches::kDisableInteractiveFormValidation) }, { - "p2papi", - IDS_FLAGS_P2P_API_NAME, - IDS_FLAGS_P2P_API_DESCRIPTION, - kOsAll, -#if defined(ENABLE_P2P_APIS) - SINGLE_VALUE_TYPE(switches::kEnableP2PApi) -#else - SINGLE_VALUE_TYPE("") -#endif - }, - { "focus-existing-tab-on-open", // FLAGS:RECORD_UMA IDS_FLAGS_FOCUS_EXISTING_TAB_ON_OPEN_NAME, IDS_FLAGS_FOCUS_EXISTING_TAB_ON_OPEN_DESCRIPTION, diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index 442428f..9e844b5 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -55,11 +55,6 @@ class PPAPITest : public UITest { // TODO(dumi): remove this switch once we have a quota management // system in place. launch_arguments_.AppendSwitch(switches::kUnlimitedQuotaForFiles); - -#if defined(ENABLE_P2P_APIS) - // Enable P2P API. - launch_arguments_.AppendSwitch(switches::kEnableP2PApi); -#endif // ENABLE_P2P_APIS } void RunTest(const std::string& test_case) { |