OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/debug/crash_logging.h" | 11 #include "base/debug/crash_logging.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "base/metrics/field_trial.h" | 14 #include "base/metrics/field_trial.h" |
15 #include "base/metrics/histogram.h" | 15 #include "base/metrics/histogram.h" |
16 #include "base/metrics/user_metrics_action.h" | 16 #include "base/metrics/user_metrics_action.h" |
17 #include "base/strings/string_number_conversions.h" | 17 #include "base/strings/string_number_conversions.h" |
18 #include "base/strings/string_util.h" | 18 #include "base/strings/string_util.h" |
19 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
20 #include "base/time/time.h" | 20 #include "base/time/time.h" |
21 #include "base/values.h" | 21 #include "base/values.h" |
22 #include "build/build_config.h" | 22 #include "build/build_config.h" |
23 #include "chrome/common/channel_info.h" | 23 #include "chrome/common/channel_info.h" |
24 #include "chrome/common/chrome_features.h" | |
24 #include "chrome/common/chrome_isolated_world_ids.h" | 25 #include "chrome/common/chrome_isolated_world_ids.h" |
25 #include "chrome/common/chrome_paths.h" | 26 #include "chrome/common/chrome_paths.h" |
26 #include "chrome/common/chrome_switches.h" | 27 #include "chrome/common/chrome_switches.h" |
27 #include "chrome/common/crash_keys.h" | 28 #include "chrome/common/crash_keys.h" |
28 #include "chrome/common/pepper_permission_util.h" | 29 #include "chrome/common/pepper_permission_util.h" |
29 #include "chrome/common/render_messages.h" | 30 #include "chrome/common/render_messages.h" |
30 #include "chrome/common/secure_origin_whitelist.h" | 31 #include "chrome/common/secure_origin_whitelist.h" |
31 #include "chrome/common/url_constants.h" | 32 #include "chrome/common/url_constants.h" |
32 #include "chrome/grit/generated_resources.h" | 33 #include "chrome/grit/generated_resources.h" |
33 #include "chrome/grit/locale_settings.h" | 34 #include "chrome/grit/locale_settings.h" |
(...skipping 1338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1372 // chrome.system.network.getNetworkInterfaces provides the same | 1373 // chrome.system.network.getNetworkInterfaces provides the same |
1373 // information. Also, the enforcement of sending and binding UDP is already done | 1374 // information. Also, the enforcement of sending and binding UDP is already done |
1374 // by chrome extension permission model. | 1375 // by chrome extension permission model. |
1375 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { | 1376 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { |
1376 #if defined(ENABLE_EXTENSIONS) | 1377 #if defined(ENABLE_EXTENSIONS) |
1377 return !IsStandaloneExtensionProcess(); | 1378 return !IsStandaloneExtensionProcess(); |
1378 #else | 1379 #else |
1379 return true; | 1380 return true; |
1380 #endif | 1381 #endif |
1381 } | 1382 } |
1383 | |
1384 std::string ChromeContentRendererClient::OverrideFlashEmbedWithHTML( | |
1385 const std::string& str_url) { | |
1386 | |
1387 if (str_url.empty()) | |
1388 return ""; | |
mlamouri (slow - plz ping)
2016/07/30 17:46:06
Instead of checking if the string is empty, could
kdsilva
2016/08/01 12:42:44
Done.
| |
1389 | |
1390 if (!base::FeatureList::IsEnabled(features::kOverrideYouTubeFlashEmbed)) | |
1391 return ""; | |
1392 | |
1393 GURL url = GURL(str_url); | |
mlamouri (slow - plz ping)
2016/07/30 17:46:06
Maybe add:
```
if (!url.is_valid())
return "";
`
kdsilva
2016/08/01 12:42:44
Done.
| |
1394 | |
1395 // We'll only modify YouTube Flash embeds. The URLs can be recognized since | |
1396 // they're in the following form: youtube.com/v/VIDEO_ID. So, we check to see | |
1397 // if the given URL does follow that format. We don't modify | |
1398 // any URLs that contain the enablejsapi=1 parameter since the page may be | |
1399 // interacting with the YouTube Flash player in Javascript and we don't | |
1400 // want to break working content. | |
1401 if (!url.DomainIs("youtube.com") || url.path().find("/v/") != 0 | |
1402 || str_url.find("enablejsapi=1") != std::string::npos) | |
1403 return ""; | |
1404 | |
1405 std::string ret_url = str_url; | |
1406 ret_url.replace(ret_url.find("/v/"), 3, "/embed/"); | |
1407 | |
1408 // If the website is using an invalid YouTube URL, we'll try and | |
1409 // fix the URL by ensuring that if there are multiple parameters, | |
1410 // the parameter string begins with a "?" and then follows with a "&" | |
1411 // for each subsequent parameter. | |
1412 size_t index = ret_url.find_first_of("&?"); | |
1413 bool invalid_url = index != std::string::npos && ret_url.at(index) == '&'; | |
1414 | |
1415 if (!invalid_url) | |
1416 return ret_url; | |
1417 | |
1418 // ? should appear first before all parameters | |
1419 ret_url.replace(index, 1, "?"); | |
1420 | |
1421 // Replace all instances of ? (after the first) with & | |
1422 for (size_t pos = index + 1; | |
1423 (pos= ret_url.find("?",pos )) != std::string::npos; pos += 1) | |
1424 ret_url.replace(pos, 1, "&"); | |
1425 return ret_url; | |
1426 } | |
OLD | NEW |