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

chrome/plugin/plugin_channel_base.h

 // Copyright (c) 2006-2008 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 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"
 #include "base/scoped_ptr.h"
 #include "chrome/common/message_router.h"
 #include "ipc/ipc_sync_channel.h"
 
 // Encapsulates an IPC channel between a renderer and a plugin process.
 class PluginChannelBase : public IPC::Channel::Listener,
                           public IPC::Message::Sender,
@@ skipping 90 matching lines @@
   bool channel_valid_;
 
   // Track whether we're within a dispatch; works like a refcount, 0 when we're
   // not.
   int in_dispatch_;
 
   // If true, sync messages will only be marked as unblocking if the channel is
   // 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_