summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/ppapi/file_callbacks.cc
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 21:33:14 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 21:33:14 +0000
commit3c217ae1a9677660cacb51a21d88020f5bbb6047 (patch)
tree310b576bbcf02b1cb86a2d3b2f945dd75702f04f /webkit/plugins/ppapi/file_callbacks.cc
parent5b5c27201e819227c046ef2f8a434c52865fcb7d (diff)
downloadchromium_src-3c217ae1a9677660cacb51a21d88020f5bbb6047.zip
chromium_src-3c217ae1a9677660cacb51a21d88020f5bbb6047.tar.gz
chromium_src-3c217ae1a9677660cacb51a21d88020f5bbb6047.tar.bz2
Revert 80982, tests failing on Win XP
TBR=ericu BUG=None TEST=None Review URL: http://codereview.chromium.org/6821020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/file_callbacks.cc')
-rw-r--r--webkit/plugins/ppapi/file_callbacks.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/plugins/ppapi/file_callbacks.cc b/webkit/plugins/ppapi/file_callbacks.cc
index 6706d47..92d443b 100644
--- a/webkit/plugins/ppapi/file_callbacks.cc
+++ b/webkit/plugins/ppapi/file_callbacks.cc
@@ -1,9 +1,10 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "webkit/plugins/ppapi/file_callbacks.h"
+#include "base/file_path.h"
#include "base/logging.h"
#include "ppapi/c/dev/ppb_file_system_dev.h"
#include "ppapi/c/dev/pp_file_info_dev.h"
@@ -75,12 +76,12 @@ void FileCallbacks::DidReadDirectory(
}
void FileCallbacks::DidOpenFileSystem(const std::string&,
- const GURL& root_url) {
+ const FilePath& root_path) {
if (callback_->completed())
return;
DCHECK(file_system_);
- file_system_->set_root_url(root_url);
+ file_system_->set_root_path(root_path);
file_system_->set_opened(true);
callback_->Run(PP_OK);