5 files changed, 9 insertions, 8 deletions
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index e60c91b..6062053 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/gfx/native_widget_types.h"
+#include "app/gfx/native_widget_types.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "build/build_config.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 86dab30..09fbe86 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -10,13 +10,13 @@
 
 #include "app/gfx/color_utils.h"
 #include "app/gfx/favicon_size.h"
+#include "app/gfx/native_widget_types.h"
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/field_trial.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/process_util.h"
 #include "base/singleton.h"
 #include "base/string_piece.h"
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 3df6147..f4270cc 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -6,8 +6,9 @@
 #define CHROME_RENDERER_RENDER_WIDGET_H_
 
 #include <vector>
+
+#include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 2ebe048..d67a68e 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -8,6 +8,7 @@
 
 #include "app/gfx/blit.h"
 #include "app/gfx/canvas.h"
+#include "app/gfx/native_widget_types.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
@@ -16,7 +17,6 @@
 #include "base/ref_counted.h"
 #include "base/string_util.h"
 #include "base/gfx/size.h"
-#include "base/gfx/native_widget_types.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index 8651aabf..5b2e6d9 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H__
-#define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H__
+#ifndef CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
+#define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
 
 #include <string>
 #include <vector>
 
+#include "app/gfx/native_widget_types.h"
 #include "base/file_path.h"
 #include "base/gfx/rect.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/ref_counted.h"
 #include "base/weak_ptr.h"
 #include "chrome/common/transport_dib.h"
@@ -198,7 +198,7 @@ class WebPluginDelegateProxy :
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(WebPluginDelegateProxy);
+  DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateProxy);
 };
 
 #endif  // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_