Revert r78134+r78136

BUG=none
TEST=none
TBR=levin@chromium.org

Review URL: http://codereview.chromium.org/6698011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78139 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 29 deletions

diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index bb3bc29..715e6ea 100644
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -148,10 +148,6 @@ class Clipboard {
   // Reads HTML from the clipboard, if available.
   void ReadHTML(Buffer buffer, string16* markup, std::string* src_url) const;
 
-  // Reads an image from the clipboard, if available. The returned data will be
-  // encoded in PNG format.
-  void ReadImage(Buffer buffer, std::string* data) const;
-
   // Reads a bookmark from the clipboard, if available.
   void ReadBookmark(string16* title, std::string* url) const;
 
diff --git a/ui/base/clipboard/clipboard_linux.cc b/ui/base/clipboard/clipboard_linux.cc
index 3bb1e88..f9ec174 100644
--- a/ui/base/clipboard/clipboard_linux.cc
+++ b/ui/base/clipboard/clipboard_linux.cc
@@ -360,15 +360,6 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
   gtk_selection_data_free(data);
 }
 
-void Clipboard::ReadImage(Buffer buffer, std::string* data) const {
-  // TODO(dcheng): implement this.
-  NOTIMPLEMENTED();
-  if (!data) {
-    NOTREACHED();
-    return;
-  }
-}
-
 void Clipboard::ReadBookmark(string16* title, std::string* url) const {
   // TODO(estade): implement this.
   NOTIMPLEMENTED();
diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
index 2761eba..89ad97d 100644
--- a/ui/base/clipboard/clipboard_mac.mm
+++ b/ui/base/clipboard/clipboard_mac.mm
@@ -222,14 +222,6 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
     src_url->clear();
 }
 
-void Clipboard::ReadImage(Buffer buffer, std::string* data) const {
-  DCHECK_EQ(buffer, BUFFER_STANDARD);
-  if (!data) {
-    NOTREACHED();
-    return;
-  }
-}
-
 void Clipboard::ReadBookmark(string16* title, std::string* url) const {
   NSPasteboard* pb = GetPasteboard();
 
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 603779b..88a1ff5 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -404,14 +404,6 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
     markup->assign(UTF8ToWide(markup_utf8));
 }
 
-void Clipboard::ReadImage(Buffer buffer, std::string* data) const {
-  DCHECK_EQ(buffer, BUFFER_STANDARD);
-  if (!data) {
-    NOTREACHED();
-    return;
-  }
-}
-
 void Clipboard::ReadBookmark(string16* title, std::string* url) const {
   if (title)
     title->clear();