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

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

Issue 60323002: Revert 232547 "Pepper: Move FileIO host from renderer to browser." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/chrome/browser/sync_file_system/local/syncable_file_system_operation.h » ('j') | 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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 using extensions::Manifest; 256 using extensions::Manifest;
257 using message_center::NotifierId; 257 using message_center::NotifierId;
258 258
259 namespace { 259 namespace {
260 260
261 // Cached version of the locale so we can return the locale on the I/O 261 // Cached version of the locale so we can return the locale on the I/O
262 // thread. 262 // thread.
263 base::LazyInstance<std::string> g_io_thread_application_locale; 263 base::LazyInstance<std::string> g_io_thread_application_locale;
264 264
265 #if defined(ENABLE_PLUGINS) 265 #if defined(ENABLE_PLUGINS)
266 const char* kPredefinedAllowedFileHandleOrigins[] = {
267 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/234789
268 "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/234789
269 };
270
271 const char* kPredefinedAllowedSocketOrigins[] = { 266 const char* kPredefinedAllowedSocketOrigins[] = {
272 "okddffdblfhhnmhodogpojmfkjmhinfp", // Test SSH Client 267 "okddffdblfhhnmhodogpojmfkjmhinfp", // Test SSH Client
273 "pnhechapfaindjhompbnflcldabbghjo", // HTerm App (SSH Client) 268 "pnhechapfaindjhompbnflcldabbghjo", // HTerm App (SSH Client)
274 "bglhmjfplikpjnfoegeomebmfnkjomhe", // see crbug.com/122126 269 "bglhmjfplikpjnfoegeomebmfnkjomhe", // see crbug.com/122126
275 "gbchcmhmhahfdphkhkmpfmihenigjmpp", // Chrome Remote Desktop 270 "gbchcmhmhahfdphkhkmpfmihenigjmpp", // Chrome Remote Desktop
276 "kgngmbheleoaphbjbaiobfdepmghbfah", // Pre-release Chrome Remote Desktop 271 "kgngmbheleoaphbjbaiobfdepmghbfah", // Pre-release Chrome Remote Desktop
277 "odkaodonbgfohohmklejpjiejmcipmib", // Dogfood Chrome Remote Desktop 272 "odkaodonbgfohohmklejpjiejmcipmib", // Dogfood Chrome Remote Desktop
278 "ojoimpklfciegopdfgeenehpalipignm", // Chromoting canary 273 "ojoimpklfciegopdfgeenehpalipignm", // Chromoting canary
279 "cbkkbcmdlboombapidmoeolnmdacpkch", // see crbug.com/129089 274 "cbkkbcmdlboombapidmoeolnmdacpkch", // see crbug.com/129089
280 "hhnbmknkdabfoieppbbljkhkfjcmcbjh", // see crbug.com/134099 275 "hhnbmknkdabfoieppbbljkhkfjcmcbjh", // see crbug.com/134099
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 } 616 }
622 617
623 #endif // defined(OS_ANDROID) 618 #endif // defined(OS_ANDROID)
624 619
625 } // namespace 620 } // namespace
626 621
627 namespace chrome { 622 namespace chrome {
628 623
629 ChromeContentBrowserClient::ChromeContentBrowserClient() { 624 ChromeContentBrowserClient::ChromeContentBrowserClient() {
630 #if defined(ENABLE_PLUGINS) 625 #if defined(ENABLE_PLUGINS)
631 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i)
632 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]);
633 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i) 626 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
634 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]); 627 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
635 #endif 628 #endif
636 629
637 permissions_policy_delegate_.reset( 630 permissions_policy_delegate_.reset(
638 new extensions::BrowserPermissionsPolicyDelegate()); 631 new extensions::BrowserPermissionsPolicyDelegate());
639 } 632 }
640 633
641 ChromeContentBrowserClient::~ChromeContentBrowserClient() { 634 ChromeContentBrowserClient::~ChromeContentBrowserClient() {
642 } 635 }
(...skipping 2008 matching lines...) Expand 10 before | Expand all | Expand 10 after
2651 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, 2644 return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
2652 allowed_file_handle_origins_) || 2645 allowed_file_handle_origins_) ||
2653 IsHostAllowedByCommandLine(url, extension_set, 2646 IsHostAllowedByCommandLine(url, extension_set,
2654 switches::kAllowNaClFileHandleAPI); 2647 switches::kAllowNaClFileHandleAPI);
2655 #else 2648 #else
2656 return false; 2649 return false;
2657 #endif 2650 #endif
2658 } 2651 }
2659 2652
2660 } // namespace chrome 2653 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/sync_file_system/local/syncable_file_system_operation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698