summaryrefslogtreecommitdiffstats
path: root/android/autofill
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-11-02 12:49:57 +0000
committerIain Merrick <husky@google.com>2010-11-03 14:58:47 +0000
commitc9e6b390683f93c99d2f4cc1bd1a344ba2b1b339 (patch)
tree2c5949c0ee493d67c28b77afb4912cfe487bd64b /android/autofill
parent9d011c97ca71353de1aed01f7fca6e7f8449cfae (diff)
downloadexternal_chromium-c9e6b390683f93c99d2f4cc1bd1a344ba2b1b339.zip
external_chromium-c9e6b390683f93c99d2f4cc1bd1a344ba2b1b339.tar.gz
external_chromium-c9e6b390683f93c99d2f4cc1bd1a344ba2b1b339.tar.bz2
Merge Chromium at r63472 : Fix profile_android.h
Various Extension-related methods added to Profile. http://src.chromium.org/viewvc/chrome?view=rev&revision=62764 Change-Id: I385b651a4e5b5b8a73f4b1391841fab312a4fb60
Diffstat (limited to 'android/autofill')
-rw-r--r--android/autofill/profile_android.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/android/autofill/profile_android.h b/android/autofill/profile_android.h
index 8b82bab..86083d8 100644
--- a/android/autofill/profile_android.h
+++ b/android/autofill/profile_android.h
@@ -133,6 +133,7 @@ class ProfileImplAndroid : public Profile {
virtual ExtensionDevToolsManager* GetExtensionDevToolsManager() { NOTREACHED(); return NULL; }
virtual ExtensionProcessManager* GetExtensionProcessManager() { NOTREACHED(); return NULL; }
virtual ExtensionMessageService* GetExtensionMessageService() { NOTREACHED(); return NULL; }
+ virtual ExtensionEventRouter* GetExtensionEventRouter() { NOTREACHED(); return NULL; }
virtual FaviconService* GetFaviconService(ServiceAccessType sat) { NOTREACHED(); return NULL; }
virtual HistoryService* GetHistoryService(ServiceAccessType sat) { NOTREACHED(); return NULL; }
virtual HistoryService* GetHistoryServiceWithoutCreating() { NOTREACHED(); return NULL; }
@@ -185,6 +186,7 @@ class ProfileImplAndroid : public Profile {
virtual FilePath last_selected_directory() { NOTREACHED(); return FilePath(""); }
virtual void set_last_selected_directory(const FilePath& path) { NOTREACHED(); }
virtual ChromeBlobStorageContext* GetBlobStorageContext() { NOTREACHED(); return NULL; }
+ virtual ExtensionInfoMap* GetExtensionInfoMap() { NOTREACHED(); return NULL; }
virtual ProfileSyncService* GetProfileSyncService() { NOTREACHED(); return NULL; }
virtual ProfileSyncService* GetProfileSyncService(const std::string&) { NOTREACHED(); return NULL; }
virtual TokenService* GetTokenService() { NOTREACHED(); return NULL; }