diff options
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/extensions/event_bindings.cc | 34 | ||||
| -rw-r--r-- | chrome/renderer/resources/event_bindings.js | 13 | ||||
| -rw-r--r-- | chrome/renderer/resources/renderer_extension_bindings.js | 1 |
3 files changed, 0 insertions, 48 deletions
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index 921a82e..db26ed7 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -85,8 +85,6 @@ class ExtensionImpl : public ExtensionBase { return v8::FunctionTemplate::New(AttachEvent); } else if (name->Equals(v8::String::New("DetachEvent"))) { return v8::FunctionTemplate::New(DetachEvent); - } else if (name->Equals(v8::String::New("GetExternalFileEntry"))) { - return v8::FunctionTemplate::New(GetExternalFileEntry); } return ExtensionBase::GetNativeFunction(name); } @@ -150,38 +148,6 @@ class ExtensionImpl : public ExtensionBase { return v8::Undefined(); } - - // Attach an event name to an object. - static v8::Handle<v8::Value> GetExternalFileEntry( - const v8::Arguments& args) { - // TODO(zelidrag): Make this magic work on other platforms when file browser - // matures enough on ChromeOS. -#if defined(OS_CHROMEOS) - DCHECK(args.Length() == 1); - DCHECK(args[0]->IsObject()); - v8::Local<v8::Object> file_def = args[0]->ToObject(); - std::string file_system_name( - *v8::String::Utf8Value(file_def->Get( - v8::String::New("fileSystemName")))); - std::string file_system_path( - *v8::String::Utf8Value(file_def->Get( - v8::String::New("fileSystemRoot")))); - std::string file_full_path( - *v8::String::Utf8Value(file_def->Get( - v8::String::New("fileFullPath")))); - bool is_directory = - file_def->Get(v8::String::New("fileIsDirectory"))->ToBoolean()->Value(); - WebFrame* webframe = WebFrame::frameForCurrentContext(); - return webframe->createFileEntry( - WebKit::WebFileSystem::TypeExternal, - WebKit::WebString::fromUTF8(file_system_name.c_str()), - WebKit::WebString::fromUTF8(file_system_path.c_str()), - WebKit::WebString::fromUTF8(file_full_path.c_str()), - is_directory); -#else - return v8::Undefined(); -#endif - } }; // Returns true if the extension running in the given |context| has sufficient diff --git a/chrome/renderer/resources/event_bindings.js b/chrome/renderer/resources/event_bindings.js index 935d256..3410686 100644 --- a/chrome/renderer/resources/event_bindings.js +++ b/chrome/renderer/resources/event_bindings.js @@ -7,7 +7,6 @@ var chrome = chrome || {}; native function GetChromeHidden(); native function AttachEvent(eventName); native function DetachEvent(eventName); - native function GetExternalFileEntry(fileDefinition); var chromeHidden = GetChromeHidden(); @@ -89,18 +88,6 @@ var chrome = chrome || {}; if (attachedNamedEvents[name]) { if (args) { args = chromeHidden.JSON.parse(args); - // TODO(zelidrag|aa): Remove this hack from here once we enable event - // JSON payload unpacking on C++ side. - if (name == "fileBrowserHandler.onExecute") { - if (args.length != 2) - return; - var fileList = args[1]; - // The second parameter for this event's payload is file definition - // dictionary that we used to reconstruct File API's Entry instance - // here. - for (var i = 0; i < fileList.length; i++) - args[1][i] = GetExternalFileEntry(fileList[i]); - } } return attachedNamedEvents[name].dispatch.apply( attachedNamedEvents[name], args); diff --git a/chrome/renderer/resources/renderer_extension_bindings.js b/chrome/renderer/resources/renderer_extension_bindings.js index b04227c..aac3db9 100644 --- a/chrome/renderer/resources/renderer_extension_bindings.js +++ b/chrome/renderer/resources/renderer_extension_bindings.js @@ -318,7 +318,6 @@ var chrome = chrome || {}; "experimental.webRequest", "history", "idle", - "fileBrowserHandler", "fileBrowserPrivate", "fileSystem", "management", |