summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-29 20:23:35 +0000
committerericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-29 20:23:35 +0000
commit252c50a4cdb5a9506938b231f4bd19afd5365757 (patch)
treeb204a7cf394cc4054749d529758b627b6448e35f /webkit
parent7954ab9ea626f4c3d34d7b92c6108030de8adcb9 (diff)
downloadchromium_src-252c50a4cdb5a9506938b231f4bd19afd5365757.zip
chromium_src-252c50a4cdb5a9506938b231f4bd19afd5365757.tar.gz
chromium_src-252c50a4cdb5a9506938b231f4bd19afd5365757.tar.bz2
Revert 60981 - Resubmitting http://codereview.chromium.org/3397030 with the needed one-line deletion.
Tested, reproed the breakage, verified the fix. BUG=none TEST=none TBR=ericu@google.com Review URL: http://codereview.chromium.org/3567006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkit_glue.cc20
-rw-r--r--webkit/glue/webkit_glue.h6
2 files changed, 0 insertions, 26 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 661b87b..33eff1a 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -313,26 +313,6 @@ WebString FilePathToWebString(const FilePath& file_path) {
return FilePathStringToWebString(file_path.value());
}
-WebKit::WebFileError PlatformFileErrorToWebFileError(
- base::PlatformFileError error_code) {
- switch (error_code) {
- case base::PLATFORM_FILE_ERROR_NOT_FOUND:
- return WebKit::WebFileErrorNotFound;
- case base::PLATFORM_FILE_ERROR_INVALID_OPERATION:
- case base::PLATFORM_FILE_ERROR_EXISTS:
- case base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY:
- return WebKit::WebFileErrorInvalidModification;
- case base::PLATFORM_FILE_ERROR_ACCESS_DENIED:
- return WebKit::WebFileErrorNoModificationAllowed;
- case base::PLATFORM_FILE_ERROR_FAILED:
- return WebKit::WebFileErrorInvalidState;
- case base::PLATFORM_FILE_ERROR_ABORT:
- return WebKit::WebFileErrorAbort;
- default:
- return WebKit::WebFileErrorInvalidModification;
- }
-}
-
namespace {
struct UserAgentState {
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 380bf36..6c7387d 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -16,10 +16,8 @@
#include "app/clipboard/clipboard.h"
#include "base/file_path.h"
-#include "base/platform_file.h"
#include "base/string16.h"
#include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFileError.h"
class GURL;
class SkBitmap;
@@ -134,10 +132,6 @@ WebKit::WebString FilePathStringToWebString(const FilePath::StringType& str);
FilePath WebStringToFilePath(const WebKit::WebString& str);
WebKit::WebString FilePathToWebString(const FilePath& file_path);
-// File error conversion
-WebKit::WebFileError PlatformFileErrorToWebFileError(
- base::PlatformFileError error_code);
-
// Returns a WebCanvas pointer associated with the given Skia canvas.
WebKit::WebCanvas* ToWebCanvas(skia::PlatformCanvas*);