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

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

Issue 1377933004: Modify --isolate-extensions to not isolate hosted apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no_isolate_apps3
Patch Set: Fixes from charlie Created 5 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
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 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #endif // defined(OS_LINUX) 9 #endif // defined(OS_LINUX)
10 10
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 schemes->insert(extensions::kExtensionScheme); 610 schemes->insert(extensions::kExtensionScheme);
611 schemes->insert(extensions::kExtensionResourceScheme); 611 schemes->insert(extensions::kExtensionResourceScheme);
612 GetSecureOriginWhitelist(origins); 612 GetSecureOriginWhitelist(origins);
613 } 613 }
614 614
615 void ChromeContentClient::AddServiceWorkerSchemes( 615 void ChromeContentClient::AddServiceWorkerSchemes(
616 std::set<std::string>* schemes) { 616 std::set<std::string>* schemes) {
617 schemes->insert(extensions::kExtensionScheme); 617 schemes->insert(extensions::kExtensionScheme);
618 } 618 }
619 619
620 void ChromeContentClient::AddIsolatedSchemes(std::set<std::string>* schemes) { 620 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {
621 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 621 return base::CommandLine::ForCurrentProcess()->HasSwitch(
622 switches::kIsolateExtensions)) { 622 switches::kIsolateExtensions);
623 schemes->insert(extensions::kExtensionScheme);
624 }
625 } 623 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698