diff options
author | mtomasz <mtomasz@chromium.org> | 2015-05-06 21:28:49 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-07 04:29:25 +0000 |
commit | 933968726534bf7a48e52d28a15223cb3a583e86 (patch) | |
tree | ec3754cfc4e465fcdc9c6cd6304081373dd6d0a3 /chrome/common/extensions/api/file_browser_handlers | |
parent | fd7cf712fe6ea5627a70a6b4e4fe1e4d2b829067 (diff) | |
download | chromium_src-933968726534bf7a48e52d28a15223cb3a583e86.zip chromium_src-933968726534bf7a48e52d28a15223cb3a583e86.tar.gz chromium_src-933968726534bf7a48e52d28a15223cb3a583e86.tar.bz2 |
Compile File Browser Handler API code on Chrome OS only.
This API is used on Chrome OS only, so it should be compiled only there.
TEST=It should compile on non-Chrome-OS + pass tests on Chrome OS.
BUG=470787
Review URL: https://codereview.chromium.org/1039543002
Cr-Commit-Position: refs/heads/master@{#328705}
Diffstat (limited to 'chrome/common/extensions/api/file_browser_handlers')
-rw-r--r-- | chrome/common/extensions/api/file_browser_handlers/file_browser_handler.cc | 6 | ||||
-rw-r--r-- | chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc | 10 |
2 files changed, 0 insertions, 16 deletions
diff --git a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler.cc b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler.cc index 260742f..ac957e4 100644 --- a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler.cc +++ b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler.cc @@ -132,7 +132,6 @@ FileBrowserHandlerParser::FileBrowserHandlerParser() { FileBrowserHandlerParser::~FileBrowserHandlerParser() { } -#if defined(OS_CHROMEOS) namespace { FileBrowserHandler* LoadFileBrowserHandler( @@ -270,13 +269,9 @@ bool LoadFileBrowserHandlers( } } // namespace -#endif bool FileBrowserHandlerParser::Parse(extensions::Extension* extension, base::string16* error) { -#if !defined(OS_CHROMEOS) - return true; -#else const base::Value* file_browser_handlers_value = nullptr; if (!extension->manifest()->Get(keys::kFileBrowserHandlers, &file_browser_handlers_value)) { @@ -306,7 +301,6 @@ bool FileBrowserHandlerParser::Parse(extensions::Extension* extension, extension->SetManifestData(keys::kFileBrowserHandlers, info.release()); return true; -#endif } const std::vector<std::string> FileBrowserHandlerParser::Keys() const { diff --git a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc index 18f6aba..9493700 100644 --- a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc +++ b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc @@ -24,15 +24,6 @@ namespace { class FileBrowserHandlerManifestTest : public ChromeManifestTest { }; -#if !defined(OS_CHROMEOS) -TEST_F(FileBrowserHandlerManifestTest, PermissionNotAllowedOnNonChromeOS) { - RunTestcase( - Testcase("filebrowser_valid.json", - "'fileBrowserHandler' is not allowed for specified platform."), - EXPECT_TYPE_WARNING); -} -#else - TEST_F(FileBrowserHandlerManifestTest, PermissionAllowed) { RunTestcase(Testcase("filebrowser_valid.json"), EXPECT_TYPE_SUCCESS); } @@ -212,6 +203,5 @@ TEST_F(FileBrowserHandlerManifestTest, ValidFileBrowserHandlerWithCreate) { EXPECT_FALSE(action->CanRead()); EXPECT_FALSE(action->CanWrite()); } -#endif } // namespace |