More linux ifdef tweaks. This reverts my earlier change (13503)....

base/clipboard.h

Index: base/clipboard.h
===================================================================
--- base/clipboard.h	(revision 14606)
+++ base/clipboard.h	(working copy)
@@ -18,9 +18,7 @@
  public:
   typedef std::string FormatType;
 #if defined(OS_LINUX)
-#if defined(TOOLKIT_GTK)
   typedef struct _GtkClipboard GtkClipboard;
-#endif
   typedef std::map<FormatType, std::pair<char*, size_t> > TargetMap;
 #endif
 
@@ -197,10 +195,8 @@
   void InsertMapping(const char* key, char* data, size_t data_len);
 
   TargetMap* clipboard_data_;
-#if defined(TOOLKIT_GTK)
   GtkClipboard* clipboard_;
 #endif
-#endif
 
   DISALLOW_EVIL_CONSTRUCTORS(Clipboard);
 };