summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 15:20:02 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 15:20:02 +0000
commitb43e556b26d1c54b47e9deb54fcfc2a4ee6216a3 (patch)
tree5fd9ff94cd23e65508c736a2c0d9736dd43da04b /gpu
parenta43858f7591e67408d501f885ec1317b5e9ceed5 (diff)
downloadchromium_src-b43e556b26d1c54b47e9deb54fcfc2a4ee6216a3.zip
chromium_src-b43e556b26d1c54b47e9deb54fcfc2a4ee6216a3.tar.gz
chromium_src-b43e556b26d1c54b47e9deb54fcfc2a4ee6216a3.tar.bz2
Use a direct include of time headers in courgette/, crypto/, dbus/, device/, google_apis/, gpu/, ipc/, jingle/.
BUG=254986 TEST=none TBR=ben@chromium.org Review URL: https://codereview.chromium.org/18156002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/common/time.h2
-rw-r--r--gpu/command_buffer/service/async_pixel_transfer_delegate.h2
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.h2
-rw-r--r--gpu/command_buffer/service/gpu_scheduler.cc2
-rw-r--r--gpu/command_buffer/service/gpu_tracer.cc2
-rw-r--r--gpu/command_buffer/service/mocks.cc2
-rw-r--r--gpu/command_buffer/service/program_manager.cc2
-rw-r--r--gpu/command_buffer/service/query_manager.cc2
-rw-r--r--gpu/config/gpu_info.h2
-rw-r--r--gpu/tools/compositor_model_bench/compositor_model_bench.cc2
10 files changed, 10 insertions, 10 deletions
diff --git a/gpu/command_buffer/common/time.h b/gpu/command_buffer/common/time.h
index 55403dd..e4eb942 100644
--- a/gpu/command_buffer/common/time.h
+++ b/gpu/command_buffer/common/time.h
@@ -7,7 +7,7 @@
#if !defined(__native_client__)
-#include "base/time.h"
+#include "base/time/time.h"
namespace gpu {
diff --git a/gpu/command_buffer/service/async_pixel_transfer_delegate.h b/gpu/command_buffer/service/async_pixel_transfer_delegate.h
index 31bb372..dc0f2d7 100644
--- a/gpu/command_buffer/service/async_pixel_transfer_delegate.h
+++ b/gpu/command_buffer/service/async_pixel_transfer_delegate.h
@@ -10,7 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "gpu/gpu_export.h"
#include "ui/gl/gl_bindings.h"
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.h b/gpu/command_buffer/service/gles2_cmd_decoder.h
index 83647a3..1526cfb 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.h
@@ -11,7 +11,7 @@
#include "base/callback.h"
#include "base/memory/weak_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "build/build_config.h"
#include "gpu/command_buffer/service/common_decoder.h"
#include "gpu/command_buffer/service/logger.h"
diff --git a/gpu/command_buffer/service/gpu_scheduler.cc b/gpu/command_buffer/service/gpu_scheduler.cc
index 54f0c1c..dba7e7e 100644
--- a/gpu/command_buffer/service/gpu_scheduler.cc
+++ b/gpu/command_buffer/service/gpu_scheduler.cc
@@ -9,7 +9,7 @@
#include "base/compiler_specific.h"
#include "base/debug/trace_event.h"
#include "base/message_loop.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_fence.h"
#include "ui/gl/gl_switches.h"
diff --git a/gpu/command_buffer/service/gpu_tracer.cc b/gpu/command_buffer/service/gpu_tracer.cc
index 632b159..6bb2dfb 100644
--- a/gpu/command_buffer/service/gpu_tracer.cc
+++ b/gpu/command_buffer/service/gpu_tracer.cc
@@ -11,7 +11,7 @@
#include "base/memory/weak_ptr.h"
#include "base/strings/string_util.h"
#include "base/threading/thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "ui/gl/gl_bindings.h"
namespace gpu {
diff --git a/gpu/command_buffer/service/mocks.cc b/gpu/command_buffer/service/mocks.cc
index a9eaa353b..2559847 100644
--- a/gpu/command_buffer/service/mocks.cc
+++ b/gpu/command_buffer/service/mocks.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/threading/thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "gpu/command_buffer/service/gpu_scheduler.h"
#include "gpu/command_buffer/service/mocks.h"
diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc
index 64d647a..d7ced0a 100644
--- a/gpu/command_buffer/service/program_manager.cc
+++ b/gpu/command_buffer/service/program_manager.cc
@@ -15,7 +15,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
#include "base/strings/string_number_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "gpu/command_buffer/common/gles2_cmd_format.h"
#include "gpu/command_buffer/common/gles2_cmd_utils.h"
#include "gpu/command_buffer/service/feature_info.h"
diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc
index 5b06630..e66478a 100644
--- a/gpu/command_buffer/service/query_manager.cc
+++ b/gpu/command_buffer/service/query_manager.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/shared_memory.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "gpu/command_buffer/common/gles2_cmd_format.h"
#include "gpu/command_buffer/service/async_pixel_transfer_manager.h"
#include "gpu/command_buffer/service/error_state.h"
diff --git a/gpu/config/gpu_info.h b/gpu/config/gpu_info.h
index 5b32a5c..2489850 100644
--- a/gpu/config/gpu_info.h
+++ b/gpu/config/gpu_info.h
@@ -12,7 +12,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/version.h"
#include "build/build_config.h"
#include "gpu/config/dx_diag_node.h"
diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc
index 613ee7f..5c21ac0 100644
--- a/gpu/tools/compositor_model_bench/compositor_model_bench.cc
+++ b/gpu/tools/compositor_model_bench/compositor_model_bench.cc
@@ -30,7 +30,7 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "gpu/tools/compositor_model_bench/render_model_utils.h"
#include "gpu/tools/compositor_model_bench/render_models.h"