summaryrefslogtreecommitdiffstats
path: root/cc/layer_tree_host_impl.cc
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 13:40:29 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 13:40:29 +0000
commitad5d142574850436f1ef5e2d94aa68c8d6594dfc (patch)
tree915eb600b08485fb948c13769592698f1d3f0ae9 /cc/layer_tree_host_impl.cc
parente3a71831c6eded3764955fd4d82b8e1b72b3773e (diff)
downloadchromium_src-ad5d142574850436f1ef5e2d94aa68c8d6594dfc.zip
chromium_src-ad5d142574850436f1ef5e2d94aa68c8d6594dfc.tar.gz
chromium_src-ad5d142574850436f1ef5e2d94aa68c8d6594dfc.tar.bz2
Revert r162986 "cc: Remove CC*.h temporary includes, part 1/4."
Build fails with "gclient hooks failed" error. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_tree_host_impl.cc')
-rw-r--r--cc/layer_tree_host_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index d0216f5..6d7a598 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -27,9 +27,9 @@
#include "CCScrollbarAnimationController.h"
#include "CCScrollbarLayerImpl.h"
#include "CCSettings.h"
-#include "base/basictypes.h"
+#include "CCSingleThreadProxy.h"
#include "base/debug/trace_event.h"
-#include "cc/single_thread_proxy.h"
+#include "base/basictypes.h"
#include "cc/texture_uploader.h"
#include <wtf/CurrentTime.h>
#include <algorithm>