diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-13 16:49:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-20 16:28:07 +0100 |
| commit | e76f99d730137b02cb24a8b723fc7526ffe03773 (patch) | |
| tree | 53152a27d57b481a0e83eadcf4ae0f359c662938 | |
| parent | e3ea42dbe72fb01590e098d40bef2c41463ced81 (diff) | |
| download | external_webkit-e76f99d730137b02cb24a8b723fc7526ffe03773.zip external_webkit-e76f99d730137b02cb24a8b723fc7526ffe03773.tar.gz external_webkit-e76f99d730137b02cb24a8b723fc7526ffe03773.tar.bz2 | |
Merge Chromium at 10.0.621.0: profile.h moved to profiles/profile.h
Upstream:
http://codereview.chromium.org/5606002
Change-Id: Ia714f1a1abaca9bef00442f98476d0e8f43eb3e7
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h index 8166eb7..236b93b 100644 --- a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h +++ b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h @@ -86,7 +86,7 @@ #include <base/string16.h> #include <base/utf_string_conversions.h> #include <chrome/browser/autofill/autofill_host.h> -#include <chrome/browser/profile.h> +#include <chrome/browser/profiles/profile.h> #include <chrome/browser/tab_contents/tab_contents.h> #include <webkit/glue/form_data.h> #endif |