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

Side by Side Diff: content/shell/common/shell_content_client.cc

Issue 1507333002: Add a content_shell flag to turn on partial site isolation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Self-review fixes Created 5 years 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 | « content/shell/common/shell_content_client.h ('k') | content/shell/common/shell_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 "content/shell/common/shell_content_client.h" 5 #include "content/shell/common/shell_content_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "blink/public/resources/grit/blink_image_resources.h" 10 #include "blink/public/resources/grit/blink_image_resources.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 base::RefCountedStaticMemory* ShellContentClient::GetDataResourceBytes( 85 base::RefCountedStaticMemory* ShellContentClient::GetDataResourceBytes(
86 int resource_id) const { 86 int resource_id) const {
87 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id); 87 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
88 } 88 }
89 89
90 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const { 90 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {
91 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); 91 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
92 } 92 }
93 93
94 bool ShellContentClient::IsSupplementarySiteIsolationModeEnabled() {
95 return base::CommandLine::ForCurrentProcess()->HasSwitch(
96 switches::kIsolateSitesForTesting);
97 }
98
94 } // namespace content 99 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/common/shell_content_client.h ('k') | content/shell/common/shell_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698