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

chrome/renderer/webplugin_delegate_proxy.h

 // Copyright (c) 2009 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_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"
 #include "chrome/renderer/plugin_channel_host.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
 #include "skia/ext/platform_canvas.h"
 #include "webkit/glue/webplugin.h"
 #include "webkit/glue/webplugininfo.h"
 #include "webkit/glue/webplugin_delegate.h"
@@ skipping 167 matching lines @@
   scoped_ptr<TransportDIB> transport_store_;
   scoped_ptr<skia::PlatformCanvas> transport_store_canvas_;
   scoped_ptr<TransportDIB> background_store_;
   scoped_ptr<skia::PlatformCanvas> background_store_canvas_;
   // This lets us know which portion of the backing store has been painted into.
   gfx::Rect backing_store_painted_;
 
   // 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_