Move native_widget_types and gtk_native_view_id_manager from base/gfx to...

chrome/plugin/plugin_channel_base.h

Index: chrome/plugin/plugin_channel_base.h
===================================================================
--- chrome/plugin/plugin_channel_base.h	(revision 28672)
+++ chrome/plugin/plugin_channel_base.h	(working copy)
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H__
-#define CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H__
+#ifndef CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H_
+#define CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H_
 
 #include <string>
 
+#include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/hash_tables.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
@@ -119,7 +119,7 @@
   // in the middle of dispatching a message.
   bool send_unblocking_only_during_dispatch_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PluginChannelBase);
+  DISALLOW_COPY_AND_ASSIGN(PluginChannelBase);
 };
 
-#endif  // CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H__
+#endif  // CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H_