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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 1101033003: Move IsOriginSecure() into //content and use it in ServiceWorker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added disallow copy/assign Created 5 years, 8 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 | « chrome/common/chrome_content_client.h ('k') | chrome/common/chrome_switches.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/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 int sandbox_type, 544 int sandbox_type,
545 int* sandbox_profile_resource_id) const { 545 int* sandbox_profile_resource_id) const {
546 DCHECK(sandbox_profile_resource_id); 546 DCHECK(sandbox_profile_resource_id);
547 if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) { 547 if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) {
548 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; 548 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
549 return true; 549 return true;
550 } 550 }
551 return false; 551 return false;
552 } 552 }
553 #endif 553 #endif
554
555 void ChromeContentClient::AddSecureSchemesAndOrigins(
556 std::set<std::string>* schemes,
557 std::set<GURL>* origins) {
558 schemes->insert(content::kChromeUIScheme);
559 schemes->insert(extensions::kExtensionScheme);
560 schemes->insert(extensions::kExtensionResourceScheme);
561
562 // TODO(kinuko): Handle command-line options for whitelisting
563 // insecure origins. crbug.com/441605
564 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698