diff options
| author | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 07:50:34 +0000 |
|---|---|---|
| committer | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 07:50:34 +0000 |
| commit | 2bb442080efb93077593088028c89988e7cb145a (patch) | |
| tree | 70f0588f5d7c8046937460303aa1c68a1ab780ab | |
| parent | 3878b4f444e6ea5cf502d93d67d7b988d0138767 (diff) | |
| download | chromium_src-2bb442080efb93077593088028c89988e7cb145a.zip chromium_src-2bb442080efb93077593088028c89988e7cb145a.tar.gz chromium_src-2bb442080efb93077593088028c89988e7cb145a.tar.bz2 | |
Merge 143662 - Add apps to TCP/UDP Pepper socket API whitelist
See crbug.com/134099 for details.
BUG=134099
TEST=build
Review URL: https://chromiumcodereview.appspot.com/10627013
TBR=dpolukhin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10698003
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@144414 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 4a7b735..b2c49e0 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -147,7 +147,13 @@ const char* kPredefinedAllowedSocketOrigins[] = { "kgngmbheleoaphbjbaiobfdepmghbfah", // Pre-release Chrome Remote Desktop "odkaodonbgfohohmklejpjiejmcipmib", // Dogfood Chrome Remote Desktop "ojoimpklfciegopdfgeenehpalipignm", // Chromoting canary - "cbkkbcmdlboombapidmoeolnmdacpkch" // see crbug.com/129089 + "cbkkbcmdlboombapidmoeolnmdacpkch", // see crbug.com/129089 + "hhnbmknkdabfoieppbbljkhkfjcmcbjh", // see crbug.com/134099 + "mablfbjkhmhkmefkjjacnbaikjkipphg", // see crbug.com/134099 + "pdeelgamlgannhelgoegilelnnojegoh", // see crbug.com/134099 + "cabapfdbkniadpollkckdnedaanlciaj", // see crbug.com/134099 + "mapljbgnjledlpdmlchihnmeclmefbba", // see crbug.com/134099 + "ghbfeebgmiidnnmeobbbaiamklmpbpii" // see crbug.com/134099 }; // Handles rewriting Web UI URLs. |