ui: Move surface/ directory out of gfx/, up to ui/.

BUG=104040
R=ben@chromium.org
TBR=brettw@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10351002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135232 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 43 insertions, 45 deletions

diff --git a/ui/gfx/surface/OWNERS b/ui/surface/OWNERS
index ae53906..fa8215e 100644
--- a/ui/gfx/surface/OWNERS
+++ b/ui/surface/OWNERS
@@ -3,4 +3,3 @@ pinkerton@chromium.org
 stuartmorgan@chromium.org
 backer@chromium.org
 apatrick@chromium.org
-
diff --git a/ui/gfx/surface/accelerated_surface_mac.cc b/ui/surface/accelerated_surface_mac.cc
index 6978c57..5f2f12f 100644
--- a/ui/gfx/surface/accelerated_surface_mac.cc
+++ b/ui/surface/accelerated_surface_mac.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
-#include "ui/gfx/surface/accelerated_surface_mac.h"
+#include "ui/surface/accelerated_surface_mac.h"
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
@@ -12,7 +12,7 @@
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/gl/scoped_make_current.h"
 #include "ui/gfx/rect.h"
-#include "ui/gfx/surface/io_surface_support_mac.h"
+#include "ui/surface/io_surface_support_mac.h"
 
 AcceleratedSurface::AcceleratedSurface()
     : io_surface_id_(0),
diff --git a/ui/gfx/surface/accelerated_surface_mac.h b/ui/surface/accelerated_surface_mac.h
index 7cf534b..fc37640 100644
--- a/ui/gfx/surface/accelerated_surface_mac.h
+++ b/ui/surface/accelerated_surface_mac.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_
-#define UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_
+#ifndef UI_SURFACE_ACCELERATED_SURFACE_MAC_H_
+#define UI_SURFACE_ACCELERATED_SURFACE_MAC_H_
 #pragma once
 
 #include <CoreFoundation/CoreFoundation.h>
@@ -16,8 +16,8 @@
 #include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
-#include "ui/gfx/surface/surface_export.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/surface_export.h"
+#include "ui/surface/transport_dib.h"
 
 // Should not include GL headers in a header file. Forward declare these types
 // instead.
@@ -178,4 +178,4 @@ class SURFACE_EXPORT AcceleratedSurface {
   base::Callback<void(TransportDIB::Id)> dib_free_callback_;
 };
 
-#endif  // UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_
+#endif  // UI_SURFACE_ACCELERATED_SURFACE_MAC_H_
diff --git a/ui/gfx/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc
index c6d18d9..ee1b6c6 100644
--- a/ui/gfx/surface/accelerated_surface_win.cc
+++ b/ui/surface/accelerated_surface_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/surface/accelerated_surface_win.h"
+#include "ui/surface/accelerated_surface_win.h"
 
 #include <windows.h>
 #include <algorithm>
@@ -11,17 +11,17 @@
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "base/string_number_conversions.h"
-#include "base/time.h"
 #include "base/debug/trace_event.h"
 #include "base/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_native_library.h"
+#include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
+#include "base/time.h"
 #include "base/tracked_objects.h"
 #include "base/win/wrapped_window_proc.h"
 #include "ui/base/win/hwnd_util.h"
diff --git a/ui/gfx/surface/accelerated_surface_win.h b/ui/surface/accelerated_surface_win.h
index 8a8da98..967b258 100644
--- a/ui/gfx/surface/accelerated_surface_win.h
+++ b/ui/surface/accelerated_surface_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_SURFACE_ACCELERATED_SURFACE_WIN_H_
-#define UI_GFX_SURFACE_ACCELERATED_SURFACE_WIN_H_
+#ifndef UI_SURFACE_ACCELERATED_SURFACE_WIN_H_
+#define UI_SURFACE_ACCELERATED_SURFACE_WIN_H_
 #pragma once
 
 #include <d3d9.h>
@@ -15,7 +15,7 @@
 #include "base/win/scoped_comptr.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
-#include "ui/gfx/surface/surface_export.h"
+#include "ui/surface/surface_export.h"
 
 class PresentThread;
 
@@ -121,4 +121,4 @@ class SURFACE_EXPORT AcceleratedSurface {
   DISALLOW_COPY_AND_ASSIGN(AcceleratedSurface);
 };
 
-#endif  // UI_GFX_SURFACE_ACCELERATED_SURFACE_WIN_H_
+#endif  // UI_SURFACE_ACCELERATED_SURFACE_WIN_H_
diff --git a/ui/gfx/surface/io_surface_support_mac.cc b/ui/surface/io_surface_support_mac.cc
index df08217..1b2c324 100644
--- a/ui/gfx/surface/io_surface_support_mac.cc
+++ b/ui/surface/io_surface_support_mac.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
 #include <dlfcn.h>
 
 #include "base/memory/singleton.h"
-#include "ui/gfx/surface/io_surface_support_mac.h"
+#include "ui/surface/io_surface_support_mac.h"
 
 typedef CFTypeRef (*IOSurfaceCreateProcPtr)(CFDictionaryRef properties);
 typedef uint32 (*IOSurfaceGetIDProcPtr)(CFTypeRef io_surface);
diff --git a/ui/gfx/surface/io_surface_support_mac.h b/ui/surface/io_surface_support_mac.h
index b49dbfe..e1d78ef 100644
--- a/ui/gfx/surface/io_surface_support_mac.h
+++ b/ui/surface/io_surface_support_mac.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 UI_GFX_SURFACE_IO_SURFACE_SUPPORT_MAC_H_
-#define UI_GFX_SURFACE_IO_SURFACE_SUPPORT_MAC_H_
+#ifndef UI_SURFACE_IO_SURFACE_SUPPORT_MAC_H_
+#define UI_SURFACE_IO_SURFACE_SUPPORT_MAC_H_
 #pragma once
 
 #include <CoreFoundation/CoreFoundation.h>
@@ -11,7 +11,7 @@
 #include <OpenGL/OpenGL.h>
 
 #include "base/basictypes.h"
-#include "ui/gfx/surface/surface_export.h"
+#include "ui/surface/surface_export.h"
 
 // This Mac OS X-specific class provides dynamically-linked access to
 // IOSurface.framework, which is only available on 10.6 and later.
@@ -67,5 +67,4 @@ class SURFACE_EXPORT IOSurfaceSupport {
   DISALLOW_COPY_AND_ASSIGN(IOSurfaceSupport);
 };
 
-#endif  // UI_GFX_SURFACE_IO_SURFACE_SUPPORT_MAC_H_
-
+#endif  // UI_SURFACE_IO_SURFACE_SUPPORT_MAC_H_
diff --git a/ui/gfx/surface/surface.gyp b/ui/surface/surface.gyp
index e11c492..af52fef 100644
--- a/ui/gfx/surface/surface.gyp
+++ b/ui/surface/surface.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 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.
 
diff --git a/ui/gfx/surface/surface_export.h b/ui/surface/surface_export.h
index 9b8420a..1b2164e 100644
--- a/ui/gfx/surface/surface_export.h
+++ b/ui/surface/surface_export.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 UI_GFX_SURFACE_SURFACE_EXPORT_H_
-#define UI_GFX_SURFACE_SURFACE_EXPORT_H_
+#ifndef UI_SURFACE_SURFACE_EXPORT_H_
+#define UI_SURFACE_SURFACE_EXPORT_H_
 #pragma once
 
 #if defined(COMPONENT_BUILD)
@@ -23,4 +23,4 @@
 #define SURFACE_EXPORT
 #endif
 
-#endif  // UI_GFX_SURFACE_SURFACE_EXPORT_H_
+#endif  // UI_SURFACE_SURFACE_EXPORT_H_
diff --git a/ui/gfx/surface/transport_dib.h b/ui/surface/transport_dib.h
index 4e4d62a..f323f1f 100644
--- a/ui/gfx/surface/transport_dib.h
+++ b/ui/surface/transport_dib.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 UI_GFX_SURFACE_TRANSPORT_DIB_H_
-#define UI_GFX_SURFACE_TRANSPORT_DIB_H_
+#ifndef UI_SURFACE_TRANSPORT_DIB_H_
+#define UI_SURFACE_TRANSPORT_DIB_H_
 #pragma once
 
 #include "base/basictypes.h"
-#include "ui/gfx/surface/surface_export.h"
+#include "ui/surface/surface_export.h"
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
 #include "base/shared_memory.h"
@@ -214,4 +214,4 @@ class SURFACE_EXPORT TransportDIB {
   DISALLOW_COPY_AND_ASSIGN(TransportDIB);
 };
 
-#endif  // UI_GFX_SURFACE_TRANSPORT_DIB_H_
+#endif  // UI_SURFACE_TRANSPORT_DIB_H_
diff --git a/ui/gfx/surface/transport_dib_android.cc b/ui/surface/transport_dib_android.cc
index 432ae71..54f8dc3 100644
--- a/ui/gfx/surface/transport_dib_android.cc
+++ b/ui/surface/transport_dib_android.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
 
-#include <unistd.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "base/eintr_wrapper.h"
 #include "base/logging.h"
diff --git a/ui/gfx/surface/transport_dib_linux.cc b/ui/surface/transport_dib_linux.cc
index c41ea9e..ae407f9 100644
--- a/ui/gfx/surface/transport_dib_linux.cc
+++ b/ui/surface/transport_dib_linux.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/ui/gfx/surface/transport_dib_mac.cc b/ui/surface/transport_dib_mac.cc
index 23c6f37..37ce877 100644
--- a/ui/gfx/surface/transport_dib_mac.cc
+++ b/ui/surface/transport_dib_mac.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
 
-#include <unistd.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "base/eintr_wrapper.h"
 #include "base/logging.h"
diff --git a/ui/gfx/surface/transport_dib_win.cc b/ui/surface/transport_dib_win.cc
index a7df666..c30e7c4c 100644
--- a/ui/gfx/surface/transport_dib_win.cc
+++ b/ui/surface/transport_dib_win.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
 
 #include <windows.h>