Chromium Code Reviews| Index: content/public/browser/content_browser_client.cc |
| diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc |
| index 27ebe56123de8326d9c3434d4fffdd092749907b..c7d2f0085e7cf81cfde7c3512190ac81037aac7a 100644 |
| --- a/content/public/browser/content_browser_client.cc |
| +++ b/content/public/browser/content_browser_client.cc |
| @@ -4,7 +4,10 @@ |
| #include "content/public/browser/content_browser_client.h" |
| +#include "base/command_line.h" |
| #include "base/files/file_path.h" |
| +#include "content/public/common/content_switches.h" |
| +#include "content/public/common/url_constants.h" |
| #include "googleurl/src/gurl.h" |
| #include "ui/gfx/image/image_skia.h" |
| @@ -267,6 +270,16 @@ ui::SelectFilePolicy* ContentBrowserClient::CreateSelectFilePolicy( |
| return NULL; |
| } |
| +std::vector<std::string> |
| +ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem() { |
|
jam
2013/04/05 19:03:52
nit: by convention, this method should have a void
kinuko
2013/04/10 05:01:51
Done.
Reg: method signature, GetAdditionalWebUISc
jam
2013/04/12 16:50:01
sure
|
| + std::vector<std::string> additional_allowed_schemes; |
| + if (CommandLine::ForCurrentProcess()->HasSwitch( |
| + switches::kAllowFileAccessFromFiles)) { |
| + additional_allowed_schemes.push_back(chrome::kFileScheme); |
| + } |
| + return additional_allowed_schemes; |
| +} |
| + |
| #if defined(OS_WIN) |
| const wchar_t* ContentBrowserClient::GetResourceDllName() { |
| return NULL; |