summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-05-13 16:41:22 +0100
committerKristian Monsen <kristianm@google.com>2011-05-20 15:46:21 +0100
commitc6f29d64d97c44a4a132966ad9538ab89303e9f5 (patch)
treef6fc011987dea78df6980923fae8b1d7d305f20c /android
parent0dcd5fce7fd690e4bcadabbb2dfd1a5ef859bb4d (diff)
downloadexternal_chromium-c6f29d64d97c44a4a132966ad9538ab89303e9f5.zip
external_chromium-c6f29d64d97c44a4a132966ad9538ab89303e9f5.tar.gz
external_chromium-c6f29d64d97c44a4a132966ad9538ab89303e9f5.tar.bz2
Merge Chromium at 10.0.621.0: Fix linker error
Add the profile constructor here so we don't have to compile the whole file. Change-Id: If8df058eba89c3d1fdb3815ca3a141f8c5fa2c4e
Diffstat (limited to 'android')
-rw-r--r--android/autofill/profile_android.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/android/autofill/profile_android.cc b/android/autofill/profile_android.cc
index 16d2816..4b14d7e 100644
--- a/android/autofill/profile_android.cc
+++ b/android/autofill/profile_android.cc
@@ -27,6 +27,16 @@
#include "chrome/browser/autofill/personal_data_manager.h"
+// We only need the Profile constructor (but that is needed since
+// ProfileImplAndroid is a subclass of Profile). To avoid compiling the file,
+// the constructor is included below.
+//
+// Taken from chrome/browser/profiles/profile.cc
+Profile::Profile()
+ : restored_last_session_(false),
+ accessibility_pause_level_(0) {
+}
+
ProfileImplAndroid::ProfileImplAndroid(const FilePath& path)
: path_(path)
{