From 3f388049fd942346ffbeed1dd8f4214d36f8f856 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Thu, 2 Jun 2011 14:58:11 +0100 Subject: Merge Chromium at r11.0.672.0: Compile fix in profile_android.h Changed return type, so new forward declaration needed: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?r1=74432&r2=74786&pathrev=74924 New function GetExtensionIOEventRouter: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=74924&r1=73343&r2=73344 New function GetOffTheRecordPrefs: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=74924&r1=73804&r2=73805 New function GetChromeURLDataManager: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=74924&r1=74431&r2=74432 Change-Id: I684259037b36fcd07cf2635ecc123e21bf1321c7 --- android/autofill/profile_android.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'android') diff --git a/android/autofill/profile_android.h b/android/autofill/profile_android.h index 399813f..31f967d 100644 --- a/android/autofill/profile_android.h +++ b/android/autofill/profile_android.h @@ -47,6 +47,10 @@ namespace history { class TopSites; } +namespace fileapi { +class FileSystemContext; +} + namespace net { class TransportSecurityState; class SSLConfigService; @@ -144,6 +148,7 @@ class ProfileImplAndroid : public Profile { virtual ExtensionProcessManager* GetExtensionProcessManager() { NOTREACHED(); return NULL; } virtual ExtensionMessageService* GetExtensionMessageService() { NOTREACHED(); return NULL; } virtual ExtensionEventRouter* GetExtensionEventRouter() { NOTREACHED(); return NULL; } + virtual ExtensionIOEventRouter* GetExtensionIOEventRouter() { NOTREACHED(); return NULL; }; virtual ExtensionService* GetExtensionService() { NOTREACHED(); return NULL; } virtual FaviconService* GetFaviconService(ServiceAccessType sat) { NOTREACHED(); return NULL; } virtual HistoryService* GetHistoryService(ServiceAccessType sat) { NOTREACHED(); return NULL; } @@ -152,10 +157,11 @@ class ProfileImplAndroid : public Profile { virtual WebDataService* GetWebDataService(ServiceAccessType sat) { NOTREACHED(); return NULL; } virtual WebDataService* GetWebDataServiceWithoutCreating() { NOTREACHED(); return NULL; } virtual PasswordStore* GetPasswordStore(ServiceAccessType sat) { NOTREACHED(); return NULL; } + virtual PrefService* GetOffTheRecordPrefs() { NOTREACHED(); return NULL; } virtual TemplateURLModel* GetTemplateURLModel() { NOTREACHED(); return NULL; } virtual TemplateURLFetcher* GetTemplateURLFetcher() { NOTREACHED(); return NULL; } virtual DownloadManager* GetDownloadManager() { NOTREACHED(); return NULL; } - virtual fileapi::SandboxedFileSystemContext* GetFileSystemContext() { NOTREACHED(); return NULL; } + virtual fileapi::FileSystemContext* GetFileSystemContext() { NOTREACHED(); return NULL; } virtual void InitThemes() { NOTREACHED(); } virtual void SetTheme(const Extension* extension) { NOTREACHED(); } virtual void SetNativeTheme() { NOTREACHED(); } @@ -210,6 +216,7 @@ class ProfileImplAndroid : public Profile { virtual bool HasProfileSyncService() const { NOTREACHED(); return false; } virtual policy::ProfilePolicyContext* GetPolicyContext() { NOTREACHED(); return NULL; } + virtual ChromeURLDataManager* GetChromeURLDataManager() { NOTREACHED(); return NULL; } virtual PrefProxyConfigTracker* GetProxyConfigTracker() { NOTREACHED(); return NULL; } virtual PrerenderManager* GetPrerenderManager() { NOTREACHED(); return NULL; } -- cgit v1.1