3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/plugin/npobject_proxy.h b/chrome/plugin/npobject_proxy.h
index 08b408d..2b8966d 100644
--- a/chrome/plugin/npobject_proxy.h
+++ b/chrome/plugin/npobject_proxy.h
@@ -8,7 +8,7 @@
 #ifndef CHROME_PLUGIN_NPOBJECT_PROXY_H_
 #define CHROME_PLUGIN_NPOBJECT_PROXY_H_
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 #include "base/ref_counted.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
diff --git a/chrome/plugin/npobject_stub.h b/chrome/plugin/npobject_stub.h
index cc5eb3a..fbf54c2 100644
--- a/chrome/plugin/npobject_stub.h
+++ b/chrome/plugin/npobject_stub.h
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 #include "base/ref_counted.h"
 #include "base/weak_ptr.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/plugin/plugin_channel_base.h b/chrome/plugin/plugin_channel_base.h
index f8c3396..bf7db52 100644
--- a/chrome/plugin/plugin_channel_base.h
+++ b/chrome/plugin/plugin_channel_base.h
@@ -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 @@ class PluginChannelBase : public IPC::Channel::Listener,
   // 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_