OLD | NEW |
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 #include "chrome/renderer/extensions/file_browser_handler_custom_bindings.h" | 5 #include "chrome/renderer/extensions/file_browser_handler_custom_bindings.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "grit/renderer_resources.h" | 11 #include "grit/renderer_resources.h" |
12 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" | 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" |
| 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h
" |
13 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" |
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
15 | 16 |
16 namespace extensions { | 17 namespace extensions { |
17 | 18 |
18 FileBrowserHandlerCustomBindings::FileBrowserHandlerCustomBindings( | 19 FileBrowserHandlerCustomBindings::FileBrowserHandlerCustomBindings( |
19 Dispatcher* dispatcher, v8::Handle<v8::Context> context) | 20 Dispatcher* dispatcher, v8::Handle<v8::Context> context) |
20 : ChromeV8Extension(dispatcher, context) { | 21 : ChromeV8Extension(dispatcher, context) { |
21 RouteFunction( | 22 RouteFunction( |
22 "GetExternalFileEntry", | 23 "GetExternalFileEntry", |
(...skipping 16 matching lines...) Expand all Loading... |
39 *v8::String::Utf8Value(file_def->Get( | 40 *v8::String::Utf8Value(file_def->Get( |
40 v8::String::New("fileSystemRoot")))); | 41 v8::String::New("fileSystemRoot")))); |
41 std::string file_full_path( | 42 std::string file_full_path( |
42 *v8::String::Utf8Value(file_def->Get( | 43 *v8::String::Utf8Value(file_def->Get( |
43 v8::String::New("fileFullPath")))); | 44 v8::String::New("fileFullPath")))); |
44 bool is_directory = | 45 bool is_directory = |
45 file_def->Get(v8::String::New("fileIsDirectory"))->ToBoolean()->Value(); | 46 file_def->Get(v8::String::New("fileIsDirectory"))->ToBoolean()->Value(); |
46 WebKit::WebFrame* webframe = | 47 WebKit::WebFrame* webframe = |
47 WebKit::WebFrame::frameForContext(v8_context()); | 48 WebKit::WebFrame::frameForContext(v8_context()); |
48 return webframe->createFileEntry( | 49 return webframe->createFileEntry( |
| 50 #ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE |
| 51 WebKit::WebFileSystemTypeExternal, |
| 52 #else |
49 WebKit::WebFileSystem::TypeExternal, | 53 WebKit::WebFileSystem::TypeExternal, |
| 54 #endif |
50 WebKit::WebString::fromUTF8(file_system_name.c_str()), | 55 WebKit::WebString::fromUTF8(file_system_name.c_str()), |
51 WebKit::WebString::fromUTF8(file_system_path.c_str()), | 56 WebKit::WebString::fromUTF8(file_system_path.c_str()), |
52 WebKit::WebString::fromUTF8(file_full_path.c_str()), | 57 WebKit::WebString::fromUTF8(file_full_path.c_str()), |
53 is_directory); | 58 is_directory); |
54 #else | 59 #else |
55 return v8::Undefined(); | 60 return v8::Undefined(); |
56 #endif | 61 #endif |
57 } | 62 } |
58 | 63 |
59 } // namespace extensions | 64 } // namespace extensions |
OLD | NEW |