More removal of GTK code.

ui/base/clipboard/clipboard.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_BASE_CLIPBOARD_CLIPBOARD_H_
 #define UI_BASE_CLIPBOARD_CLIPBOARD_H_
 
 #include <map>

[Lei Zhang, 2014/04/11 21:07:04]

You can remove map and vector.

[Elliot Glaysher, 2014/04/11 21:28:16]

No I can't. They're used elsewhere.

 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/process/process.h"
 #include "base/strings/string16.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_checker.h"
 #include "ui/base/clipboard/clipboard_types.h"
 #include "ui/base/ui_base_export.h"
 
-#if defined(TOOLKIT_GTK)
-#include <gdk/gdk.h>
-#endif
-
 #if defined(OS_WIN)
 #include <objidl.h>
 #elif defined(OS_ANDROID)
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #endif
 
 #if defined(USE_AURA) && defined(USE_X11)
@@ skipping 12 matching lines @@
 namespace content {
 class ClipboardMessageFilter;
 }
 
 namespace gfx {
 class Size;
 }
 
 class SkBitmap;
 
-#if defined(TOOLKIT_GTK)
-typedef struct _GtkClipboard GtkClipboard;
-#endif
-
 #ifdef __OBJC__
 @class NSString;
 #else
 class NSString;
 #endif
 
 namespace ui {
 class ClipboardTest;
 class ScopedClipboardWriter;
 
@@ skipping 50 matching lines @@
     UINT ToUINT() const { return data_.cfFormat; }
     FORMATETC data_;
 #elif defined(USE_AURA)
     explicit FormatType(const std::string& native_format);
     const std::string& data() const { return data_; }
     std::string data_;
 #elif defined(OS_MACOSX)
     explicit FormatType(NSString* native_format);
     NSString* ToNSString() const { return data_; }
     NSString* data_;
-#elif defined(TOOLKIT_GTK)
-    explicit FormatType(const std::string& native_format);
-    explicit FormatType(const GdkAtom& native_format);
-    const GdkAtom& ToGdkAtom() const { return data_; }
-    GdkAtom data_;
 #elif defined(OS_ANDROID)
     explicit FormatType(const std::string& native_format);
     const std::string& data() const { return data_; }
     std::string data_;
 #else
 #error No FormatType definition.
 #endif
 
     // Copyable and assignable, since this is essentially an opaque value type.
   };
@@ skipping 216 matching lines @@
   // Free a handle depending on its type (as intuited from format)
   static void FreeData(unsigned int format, HANDLE data);
 
   // Return the window that should be the clipboard owner, creating it
   // if neccessary.  Marked const for lazily initialization by const methods.
   HWND GetClipboardWindow() const;
 
   // Mark this as mutable so const methods can still do lazy initialization.
   mutable scoped_ptr<base::win::MessageWindow> clipboard_owner_;
 
-#elif defined(TOOLKIT_GTK)
-  // The public API is via WriteObjects() which dispatches to multiple
-  // Write*() calls, but on GTK we must write all the clipboard types
-  // in a single GTK call.  To support this we store the current set
-  // of data we intend to put on the clipboard on clipboard_data_ as
-  // WriteObjects is running, and then at the end call SetGtkClipboard
-  // which replaces whatever is on the system clipboard with the
-  // contents of clipboard_data_.
-
- public:
-  typedef std::map<std::string, std::pair<char*, size_t> > TargetMap;
-
- private:
-  // Write changes to gtk clipboard.
-  void SetGtkClipboard(ClipboardType type);
-  // Insert a mapping into clipboard_data_.
-  void InsertMapping(const char* key, char* data, size_t data_len);
-
-  // Find the gtk clipboard for the passed type enum.
-  GtkClipboard* LookupBackingClipboard(ClipboardType type) const;
-
-  TargetMap* clipboard_data_;
-  GtkClipboard* clipboard_;
-  GtkClipboard* primary_selection_;
 #elif defined(USE_CLIPBOARD_AURAX11)
  private:
   // We keep our implementation details private because otherwise we bring in
   // the X11 headers and break chrome compile.
   class AuraX11Details;
   scoped_ptr<AuraX11Details> aurax11_details_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Clipboard);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_CLIPBOARD_CLIPBOARD_H_