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

Side by Side Diff: content/public/common/content_client.h

Issue 10871013: Add !defined(OS_IOS) to if defined(OS_MACOS) around functions GetSandboxProfileForSandboxType and G… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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.cc ('k') | content/public/common/content_client.cc » ('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 #ifndef CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
6 #define CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_ 6 #define CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 // Returns a native image given its id. 122 // Returns a native image given its id.
123 virtual gfx::Image& GetNativeImageNamed(int resource_id) const; 123 virtual gfx::Image& GetNativeImageNamed(int resource_id) const;
124 124
125 #if defined(OS_WIN) 125 #if defined(OS_WIN)
126 // Allows the embedder to sandbox a plugin, and apply a custom policy. 126 // Allows the embedder to sandbox a plugin, and apply a custom policy.
127 virtual bool SandboxPlugin(CommandLine* command_line, 127 virtual bool SandboxPlugin(CommandLine* command_line,
128 sandbox::TargetPolicy* policy); 128 sandbox::TargetPolicy* policy);
129 #endif 129 #endif
130 130
131 #if defined(OS_MACOSX) 131 #if defined(OS_MACOSX) && !defined(OS_IOS)
132 // Allows the embedder to define a new |sandbox_type| by mapping it to the 132 // Allows the embedder to define a new |sandbox_type| by mapping it to the
133 // resource ID corresponding to the sandbox profile to use. The legal values 133 // resource ID corresponding to the sandbox profile to use. The legal values
134 // for |sandbox_type| are defined by the embedder and should start with 134 // for |sandbox_type| are defined by the embedder and should start with
135 // SandboxType::SANDBOX_TYPE_AFTER_LAST_TYPE. Returns false if no sandbox 135 // SandboxType::SANDBOX_TYPE_AFTER_LAST_TYPE. Returns false if no sandbox
136 // profile for the given |sandbox_type| exists. Otherwise, 136 // profile for the given |sandbox_type| exists. Otherwise,
137 // |sandbox_profile_resource_id| is set to the resource ID corresponding to 137 // |sandbox_profile_resource_id| is set to the resource ID corresponding to
138 // the sandbox profile to use and true is returned. 138 // the sandbox profile to use and true is returned.
139 virtual bool GetSandboxProfileForSandboxType( 139 virtual bool GetSandboxProfileForSandboxType(
140 int sandbox_type, 140 int sandbox_type,
141 int* sandbox_profile_resource_id) const; 141 int* sandbox_profile_resource_id) const;
(...skipping 15 matching lines...) Expand all
157 ContentPluginClient* plugin_; 157 ContentPluginClient* plugin_;
158 // The embedder API for participating in renderer logic. 158 // The embedder API for participating in renderer logic.
159 ContentRendererClient* renderer_; 159 ContentRendererClient* renderer_;
160 // The embedder API for participating in utility logic. 160 // The embedder API for participating in utility logic.
161 ContentUtilityClient* utility_; 161 ContentUtilityClient* utility_;
162 }; 162 };
163 163
164 } // namespace content 164 } // namespace content
165 165
166 #endif // CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_ 166 #endif // CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | content/public/common/content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698