OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
James Cook
2014/04/15 17:21:21
About the change description - that bug is marked
lazyboy
2014/04/15 17:26:31
http://crbug.com/363437 is the right one. Descript
| |
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 APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ | 5 #ifndef APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ |
6 #define APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ | 6 #define APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "extensions/browser/extensions_browser_client.h" | 9 #include "extensions/browser/extensions_browser_client.h" |
10 | 10 |
11 class PrefService; | 11 class PrefService; |
(...skipping 23 matching lines...) Expand all Loading... | |
35 content::BrowserContext* context) OVERRIDE; | 35 content::BrowserContext* context) OVERRIDE; |
36 virtual content::BrowserContext* GetOriginalContext( | 36 virtual content::BrowserContext* GetOriginalContext( |
37 content::BrowserContext* context) OVERRIDE; | 37 content::BrowserContext* context) OVERRIDE; |
38 virtual bool IsGuestSession(content::BrowserContext* context) const OVERRIDE; | 38 virtual bool IsGuestSession(content::BrowserContext* context) const OVERRIDE; |
39 virtual bool IsExtensionIncognitoEnabled( | 39 virtual bool IsExtensionIncognitoEnabled( |
40 const std::string& extension_id, | 40 const std::string& extension_id, |
41 content::BrowserContext* context) const OVERRIDE; | 41 content::BrowserContext* context) const OVERRIDE; |
42 virtual bool CanExtensionCrossIncognito( | 42 virtual bool CanExtensionCrossIncognito( |
43 const extensions::Extension* extension, | 43 const extensions::Extension* extension, |
44 content::BrowserContext* context) const OVERRIDE; | 44 content::BrowserContext* context) const OVERRIDE; |
45 virtual bool IsWebViewRequest(net::URLRequest* request) const OVERRIDE; | |
45 virtual net::URLRequestJob* MaybeCreateResourceBundleRequestJob( | 46 virtual net::URLRequestJob* MaybeCreateResourceBundleRequestJob( |
46 net::URLRequest* request, | 47 net::URLRequest* request, |
47 net::NetworkDelegate* network_delegate, | 48 net::NetworkDelegate* network_delegate, |
48 const base::FilePath& directory_path, | 49 const base::FilePath& directory_path, |
49 const std::string& content_security_policy, | 50 const std::string& content_security_policy, |
50 bool send_cors_header) OVERRIDE; | 51 bool send_cors_header) OVERRIDE; |
51 virtual bool AllowCrossRendererResourceLoad(net::URLRequest* request, | 52 virtual bool AllowCrossRendererResourceLoad(net::URLRequest* request, |
52 bool is_incognito, | 53 bool is_incognito, |
53 const Extension* extension, | 54 const Extension* extension, |
54 InfoMap* extension_info_map) | 55 InfoMap* extension_info_map) |
(...skipping 27 matching lines...) Expand all Loading... | |
82 | 83 |
83 // The PrefService for |browser_context_|. | 84 // The PrefService for |browser_context_|. |
84 scoped_ptr<PrefService> prefs_; | 85 scoped_ptr<PrefService> prefs_; |
85 | 86 |
86 DISALLOW_COPY_AND_ASSIGN(ShellExtensionsBrowserClient); | 87 DISALLOW_COPY_AND_ASSIGN(ShellExtensionsBrowserClient); |
87 }; | 88 }; |
88 | 89 |
89 } // namespace extensions | 90 } // namespace extensions |
90 | 91 |
91 #endif // APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ | 92 #endif // APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ |
OLD | NEW |