Refactor: Move app/surface to ui/gfx/surface.

content/browser/renderer_host/accelerated_surface_container_mac.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 CONTENT_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MAC_H_
-#define CONTENT_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MAC_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_SURFACE_CONTAINER_MAC_H_
+#define CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_SURFACE_CONTAINER_MAC_H_
 #pragma once
 
 // The "GPU plugin" is currently implemented as a special kind of
 // NPAPI plugin to provide high-performance on-screen 3D rendering for
 // Pepper 3D.
 //
 // On Windows and X11 platforms the GPU plugin relies on cross-process
 // parenting of windows, which is not supported via any public APIs in
 // the Mac OS X window system.
 //
 // To achieve full hardware acceleration we use the new IOSurface APIs
 // introduced in Mac OS X 10.6. The GPU plugin's process produces an
 // IOSurface and renders into it using OpenGL. It uses the
 // IOSurfaceGetID and IOSurfaceLookup APIs to pass a reference to this
 // surface to the browser process for on-screen rendering. The GPU
 // plugin essentially looks like a windowless plugin; the browser
 // process gets all of the mouse events, because the plugin process
 // does not have an on-screen window.
 //
 // This class encapsulates some of the management of these data
 // structures, in conjunction with the AcceleratedSurfaceContainerManagerMac.
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <OpenGL/OpenGL.h>
 
-#include "app/surface/transport_dib.h"
 #include "base/basictypes.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/scoped_ptr.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/surface/transport_dib.h"
 
 namespace webkit {
 namespace npapi {
 struct WebPluginGeometry;
 }
 }
 
 class AcceleratedSurfaceContainerManagerMac;
 
 class AcceleratedSurfaceContainerMac {
@@ skipping 94 matching lines @@
 
   // Releases the IOSurface reference, if any, retained by this object.
   void ReleaseIOSurface();
 
   // Enqueue our texture for later deletion.
   void EnqueueTextureForDeletion();
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerMac);
 };
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MAC_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_SURFACE_CONTAINER_MAC_H_