From 252c50a4cdb5a9506938b231f4bd19afd5365757 Mon Sep 17 00:00:00 2001 From: "ericu@google.com" Date: Wed, 29 Sep 2010 20:23:35 +0000 Subject: 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 --- webkit/glue/webkit_glue.cc | 20 -------------------- webkit/glue/webkit_glue.h | 6 ------ 2 files changed, 26 deletions(-) (limited to 'webkit') 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*); -- cgit v1.1