remove unneeded webkit_glue:: and wrap windows functions in ifdefs

Review URL: http://codereview.chromium.org/6413
Patch from icefox.


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

1 files changed, 12 insertions, 10 deletions

diff --git a/webkit/glue/simple_clipboard_impl.cc b/webkit/glue/simple_clipboard_impl.cc
index e4a8eaa..43ff30d 100644
--- a/webkit/glue/simple_clipboard_impl.cc
+++ b/webkit/glue/simple_clipboard_impl.cc
@@ -18,47 +18,49 @@ namespace webkit_glue {
 
 Clipboard clipboard;
 
-void webkit_glue::ClipboardClear() {
+void ClipboardClear() {
   clipboard.Clear();
 }
 
-void webkit_glue::ClipboardWriteText(const std::wstring& text) {
+void ClipboardWriteText(const std::wstring& text) {
   clipboard.WriteText(text);
 }
 
-void webkit_glue::ClipboardWriteHTML(const std::wstring& html,
+void ClipboardWriteHTML(const std::wstring& html,
                                      const GURL& url) {
   clipboard.WriteHTML(html, url.spec());
 }
 
-void webkit_glue::ClipboardWriteBookmark(const std::wstring& title,
+void ClipboardWriteBookmark(const std::wstring& title,
                                          const GURL& url) {
   clipboard.WriteBookmark(title, url.spec());
 }
 
-void webkit_glue::ClipboardWriteBitmap(const SkBitmap& bitmap) {
+#if defined(OS_WIN)
+void ClipboardWriteBitmap(const SkBitmap& bitmap) {
   SkAutoLockPixels bitmap_lock(bitmap); 
   clipboard.WriteBitmap(bitmap.getPixels(),
                         gfx::Size(bitmap.width(), bitmap.height()));
 }
 
-void webkit_glue::ClipboardWriteWebSmartPaste() {
+void ClipboardWriteWebSmartPaste() {
   clipboard.WriteWebSmartPaste();
 }
+#endif
 
-bool webkit_glue::ClipboardIsFormatAvailable(unsigned int format) {
+bool ClipboardIsFormatAvailable(unsigned int format) {
   return clipboard.IsFormatAvailable(format);
 }
 
-void webkit_glue::ClipboardReadText(std::wstring* result) {
+void ClipboardReadText(std::wstring* result) {
   clipboard.ReadText(result);
 }
 
-void webkit_glue::ClipboardReadAsciiText(std::string* result) {
+void ClipboardReadAsciiText(std::string* result) {
   clipboard.ReadAsciiText(result);
 }
 
-void webkit_glue::ClipboardReadHTML(std::wstring* markup, GURL* url) {
+void ClipboardReadHTML(std::wstring* markup, GURL* url) {
   std::string url_str;
   clipboard.ReadHTML(markup, url ? &url_str : NULL);
   if (url)