summaryrefslogtreecommitdiffstats
path: root/cc/resource_provider.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 03:07:13 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 03:07:13 +0000
commit55a124d0d7dc22f835c6dd873f4755fb0aba85af (patch)
tree112eba01183d3db09f7b64a85df9a7d091e0d773 /cc/resource_provider.cc
parentbe24ab2e5c5145874a62661c957624ec860acd1d (diff)
downloadchromium_src-55a124d0d7dc22f835c6dd873f4755fb0aba85af.zip
chromium_src-55a124d0d7dc22f835c6dd873f4755fb0aba85af.tar.gz
chromium_src-55a124d0d7dc22f835c6dd873f4755fb0aba85af.tar.bz2
cc: Remove CC*.h temporary includes, part 4/4.
BUG=155413 TEST=cc_unittests R=enne@chromium.org,jamesr@chromium.org TBR=jamesr@chromium.org Review URL: https://chromiumcodereview.appspot.com/11233025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resource_provider.cc')
-rw-r--r--cc/resource_provider.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index a31dfa5..8d1ac0b 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -8,7 +8,6 @@
#include <limits.h>
-#include "CCProxy.h"
#include "IntRect.h"
#include "base/debug/alias.h"
#include "base/hash_tables.h"
@@ -16,6 +15,7 @@
#include "base/string_split.h"
#include "base/string_util.h"
#include "cc/gl_renderer.h" // For the GLC() macro.
+#include "cc/proxy.h"
#include "cc/texture_uploader.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"