Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 652293004: Remove some whitelist entries for socket. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 "cbkkbcmdlboombapidmoeolnmdacpkch", // see crbug.com/129089 306 "cbkkbcmdlboombapidmoeolnmdacpkch", // see crbug.com/129089
307 "hhnbmknkdabfoieppbbljkhkfjcmcbjh", // see crbug.com/134099 307 "hhnbmknkdabfoieppbbljkhkfjcmcbjh", // see crbug.com/134099
308 "mablfbjkhmhkmefkjjacnbaikjkipphg", // see crbug.com/134099 308 "mablfbjkhmhkmefkjjacnbaikjkipphg", // see crbug.com/134099
309 "pdeelgamlgannhelgoegilelnnojegoh", // see crbug.com/134099 309 "pdeelgamlgannhelgoegilelnnojegoh", // see crbug.com/134099
310 "cabapfdbkniadpollkckdnedaanlciaj", // see crbug.com/134099 310 "cabapfdbkniadpollkckdnedaanlciaj", // see crbug.com/134099
311 "mapljbgnjledlpdmlchihnmeclmefbba", // see crbug.com/134099 311 "mapljbgnjledlpdmlchihnmeclmefbba", // see crbug.com/134099
312 "ghbfeebgmiidnnmeobbbaiamklmpbpii", // see crbug.com/134099 312 "ghbfeebgmiidnnmeobbbaiamklmpbpii", // see crbug.com/134099
313 "jdfhpkjeckflbbleddjlpimecpbjdeep", // see crbug.com/142514 313 "jdfhpkjeckflbbleddjlpimecpbjdeep", // see crbug.com/142514
314 "iabmpiboiopbgfabjmgeedhcmjenhbla", // see crbug.com/165080 314 "iabmpiboiopbgfabjmgeedhcmjenhbla", // see crbug.com/165080
315 "B7CF8A292249681AF81771650BA4CEEAF19A4560", // see crbug.com/165080 315 "B7CF8A292249681AF81771650BA4CEEAF19A4560", // see crbug.com/165080
316 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/234789
317 "4EB74897CB187C7633357C2FE832E0AD6A44883A", // see crbug.com/234789
318 "7525AF4F66763A70A883C4700529F647B470E4D2", // see crbug.com/238084 316 "7525AF4F66763A70A883C4700529F647B470E4D2", // see crbug.com/238084
319 "0B549507088E1564D672F7942EB87CA4DAD73972", // see crbug.com/238084 317 "0B549507088E1564D672F7942EB87CA4DAD73972", // see crbug.com/238084
320 "864288364E239573E777D3E0E36864E590E95C74" // see crbug.com/238084 318 "864288364E239573E777D3E0E36864E590E95C74" // see crbug.com/238084
321 }; 319 };
322 #endif 320 #endif
323 321
324 // Returns a copy of the given url with its host set to given host and path set 322 // Returns a copy of the given url with its host set to given host and path set
325 // to given path. Other parts of the url will be the same. 323 // to given path. Other parts of the url will be the same.
326 GURL ReplaceURLHostAndPath(const GURL& url, 324 GURL ReplaceURLHostAndPath(const GURL& url,
327 const std::string& host, 325 const std::string& host,
(...skipping 2314 matching lines...) Expand 10 before | Expand all | Expand 10 after
2642 switches::kDisableWebRtcEncryption, 2640 switches::kDisableWebRtcEncryption,
2643 }; 2641 };
2644 to_command_line->CopySwitchesFrom(from_command_line, 2642 to_command_line->CopySwitchesFrom(from_command_line,
2645 kWebRtcDevSwitchNames, 2643 kWebRtcDevSwitchNames,
2646 arraysize(kWebRtcDevSwitchNames)); 2644 arraysize(kWebRtcDevSwitchNames));
2647 } 2645 }
2648 } 2646 }
2649 #endif // defined(ENABLE_WEBRTC) 2647 #endif // defined(ENABLE_WEBRTC)
2650 2648
2651 } // namespace chrome 2649 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698