summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-05-12 16:51:28 +0100
committerKristian Monsen <kristianm@google.com>2011-05-20 15:35:13 +0100
commit0dcd5fce7fd690e4bcadabbb2dfd1a5ef859bb4d (patch)
treeea3b7475fb7ab51cb13df86f46aa94e2e8a02ff4 /android
parent7f5be1d04007766d15c1ca8bcbfbadd43f605aa0 (diff)
downloadexternal_chromium-0dcd5fce7fd690e4bcadabbb2dfd1a5ef859bb4d.zip
external_chromium-0dcd5fce7fd690e4bcadabbb2dfd1a5ef859bb4d.tar.gz
external_chromium-0dcd5fce7fd690e4bcadabbb2dfd1a5ef859bb4d.tar.bz2
Merge Chromium at 10.0.621.0: profile.h moved upstream
profile.h has moved upstream http://codereview.chromium.org/5606002 Change-Id: Ib1652546f185ff862a39ebb3e77c9678c78dbaac
Diffstat (limited to 'android')
-rw-r--r--android/autofill/profile_android.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/autofill/profile_android.h b/android/autofill/profile_android.h
index c2e4913..399813f 100644
--- a/android/autofill/profile_android.h
+++ b/android/autofill/profile_android.h
@@ -37,7 +37,7 @@
#include "base/scoped_ptr.h"
#include "base/timer.h"
#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profile.h"
+#include "chrome/browser/profiles/profile.h"
namespace base {
class Time;