content/shell/common/shell_content_client.cc - Issue 1741783002: Add disabled origin trial feature list

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1741783002: Add disabled origin trial feature list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ef-finch

Patch Set: Const correctness; clear disabled features Created 4 years, 6 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

« chrome/common/chrome_switches.cc ('K') | « content/shell/common/shell_content_client.h ('k') | third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp » ('j') | third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 94 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
105	105

106 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {	106 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {

107 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);	107 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);

108 }	108 }

109	109

110 bool ShellContentClient::IsSupplementarySiteIsolationModeEnabled() {	110 bool ShellContentClient::IsSupplementarySiteIsolationModeEnabled() {

111 return base::CommandLine::ForCurrentProcess()->HasSwitch(	111 return base::CommandLine::ForCurrentProcess()->HasSwitch(

112 switches::kIsolateSitesForTesting);	112 switches::kIsolateSitesForTesting);

113 }	113 }

114	114

115 base::StringPiece ShellContentClient::GetOriginTrialPublicKey() {	115 base::StringPiece ShellContentClient::GetOriginTrialPublicKey() const {

116 return origin_trial_public_key_;	116 return origin_trial_public_key_;

117 }	117 }

118	118

119 } // namespace content	119 } // namespace content

OLD	NEW