| Index: chrome/renderer/extensions/file_system_natives.cc
|
| diff --git a/chrome/renderer/extensions/file_system_natives.cc b/chrome/renderer/extensions/file_system_natives.cc
|
| index dbc84736e52964b304cc0f52c7f827a16c1c0fc9..522d1ca97b5e541539f051167bdaa962e542de3b 100644
|
| --- a/chrome/renderer/extensions/file_system_natives.cc
|
| +++ b/chrome/renderer/extensions/file_system_natives.cc
|
| @@ -39,8 +39,8 @@ void FileSystemNatives::GetIsolatedFileSystem(
|
| DCHECK(args.Length() == 1 || args.Length() == 2);
|
| DCHECK(args[0]->IsString());
|
| std::string file_system_id(*v8::String::Utf8Value(args[0]));
|
| - WebKit::WebFrame* webframe =
|
| - WebKit::WebFrame::frameForContext(context()->v8_context());
|
| + blink::WebFrame* webframe =
|
| + blink::WebFrame::frameForContext(context()->v8_context());
|
| DCHECK(webframe);
|
|
|
| GURL context_url =
|
| @@ -64,9 +64,9 @@ void FileSystemNatives::GetIsolatedFileSystem(
|
| optional_root_name));
|
|
|
| args.GetReturnValue().Set(webframe->createFileSystem(
|
| - WebKit::WebFileSystemTypeIsolated,
|
| - WebKit::WebString::fromUTF8(name),
|
| - WebKit::WebString::fromUTF8(root)));
|
| + blink::WebFileSystemTypeIsolated,
|
| + blink::WebString::fromUTF8(name),
|
| + blink::WebString::fromUTF8(root)));
|
| }
|
|
|
| void FileSystemNatives::GetFileEntry(
|
| @@ -74,7 +74,7 @@ void FileSystemNatives::GetFileEntry(
|
| DCHECK(args.Length() == 5);
|
| DCHECK(args[0]->IsString());
|
| std::string type_string = *v8::String::Utf8Value(args[0]->ToString());
|
| - WebKit::WebFileSystemType type;
|
| + blink::WebFileSystemType type;
|
| bool is_valid_type = fileapi::GetFileSystemPublicType(type_string, &type);
|
| DCHECK(is_valid_type);
|
| if (is_valid_type == false) {
|
| @@ -93,14 +93,14 @@ void FileSystemNatives::GetFileEntry(
|
| DCHECK(args[4]->IsBoolean());
|
| bool is_directory = args[4]->BooleanValue();
|
|
|
| - WebKit::WebFrame* webframe =
|
| - WebKit::WebFrame::frameForContext(context()->v8_context());
|
| + blink::WebFrame* webframe =
|
| + blink::WebFrame::frameForContext(context()->v8_context());
|
| DCHECK(webframe);
|
| args.GetReturnValue().Set(webframe->createFileEntry(
|
| type,
|
| - WebKit::WebString::fromUTF8(file_system_name),
|
| - WebKit::WebString::fromUTF8(file_system_root_url),
|
| - WebKit::WebString::fromUTF8(file_path_string),
|
| + blink::WebString::fromUTF8(file_system_name),
|
| + blink::WebString::fromUTF8(file_system_root_url),
|
| + blink::WebString::fromUTF8(file_path_string),
|
| is_directory));
|
| }
|
|
|
|
|