summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-06-30 13:40:43 +0100
committerKristian Monsen <kristianm@google.com>2011-06-30 13:40:43 +0100
commit24111c7f4d848be14284815bb6c9a2218740a263 (patch)
treeac1ed9246fb1095e05b289aea31c65805837615c
parenta186c83571fcc6481a1b6be31eb59ae9d6dfee41 (diff)
downloadexternal_webkit-24111c7f4d848be14284815bb6c9a2218740a263.zip
external_webkit-24111c7f4d848be14284815bb6c9a2218740a263.tar.gz
external_webkit-24111c7f4d848be14284815bb6c9a2218740a263.tar.bz2
Merge Chromium at r11.0.696.0: Compile fix, update include location
chrome/browser/tab_contents/tab_contents.h has moved to content/browser/tab_contents/tab_contents.h Change-Id: I899af0a4895f0d6a30850c65c22fbc67c7bedd88
-rw-r--r--Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
index 1636405..670b307 100644
--- a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
+++ b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
@@ -91,7 +91,7 @@
#include <base/utf_string_conversions.h>
#include <chrome/browser/autofill/autofill_host.h>
#include <chrome/browser/profiles/profile.h>
-#include <chrome/browser/tab_contents/tab_contents.h>
+#include <content/browser/tab_contents/tab_contents.h>
#include <webkit/glue/form_data.h>
#endif