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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 15521002: Flag and whitelist to allow crxfs api in NaCl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ifdef Created 7 years, 7 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 | « no previous file | chrome/browser/chrome_content_browser_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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "content/public/browser/content_browser_client.h" 14 #include "content/public/browser/content_browser_client.h"
15 15
16 #if defined(OS_ANDROID) 16 #if defined(OS_ANDROID)
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #endif 18 #endif
19 19
20 namespace content { 20 namespace content {
21 class QuotaPermissionContext; 21 class QuotaPermissionContext;
22 } 22 }
23 23
24 namespace extensions { 24 namespace extensions {
25 class Extension;
26 class BrowserPermissionsPolicyDelegate; 25 class BrowserPermissionsPolicyDelegate;
27 } 26 }
28 27
29 namespace user_prefs { 28 namespace user_prefs {
30 class PrefRegistrySyncable; 29 class PrefRegistrySyncable;
31 } 30 }
32 31
33 namespace chrome { 32 namespace chrome {
34 33
35 class ChromeContentBrowserClient : public content::ContentBrowserClient { 34 class ChromeContentBrowserClient : public content::ContentBrowserClient {
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 249 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
251 bool* success) OVERRIDE; 250 bool* success) OVERRIDE;
252 #endif 251 #endif
253 #if defined(USE_NSS) 252 #if defined(USE_NSS)
254 virtual 253 virtual
255 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( 254 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
256 const GURL& url) OVERRIDE; 255 const GURL& url) OVERRIDE;
257 #endif 256 #endif
258 257
259 private: 258 private:
259 #if defined(ENABLE_PLUGINS)
260 // Set of origins that can use TCP/UDP private APIs from NaCl. 260 // Set of origins that can use TCP/UDP private APIs from NaCl.
261 std::set<std::string> allowed_socket_origins_; 261 std::set<std::string> allowed_socket_origins_;
262 #endif
262 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> 263 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate>
263 permissions_policy_delegate_; 264 permissions_policy_delegate_;
264 265
265 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 266 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
266 }; 267 };
267 268
268 } // namespace chrome 269 } // namespace chrome
269 270
270 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 271 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698