From d26447072f93114b19c75ae32e18a68487125c0c Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 6 Jul 2011 22:57:49 +0100 Subject: Merge Chromium at r12.0.742.93: Various profile.h compile fixes Not including chrome/common/extensions/extension.h, the main reason is that this includes UserScript, which crashes with WebCore code. Forward declaring needed struct. ifdef out GetResourceContext as it returns a const content::ResourceContext&. We cannot create this without including the file, which are not in the android chromium tree. Change-Id: I3540894d5e590ac7decea92c0ef0562e622222e5 --- chrome/browser/profiles/profile.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'chrome') diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h index a27496e..9f56b7e 100644 --- a/chrome/browser/profiles/profile.h +++ b/chrome/browser/profiles/profile.h @@ -10,7 +10,9 @@ #include "base/basictypes.h" #include "base/logging.h" +#ifndef ANDROID #include "chrome/common/extensions/extension.h" +#endif namespace base { class Time; @@ -46,6 +48,16 @@ namespace webkit_database { class DatabaseTracker; } +#ifdef ANDROID +struct UnloadedExtensionInfo { + enum Reason { + DISABLE, // The extension is being disabled. + UPDATE, // The extension is being updated to a newer version. + UNINSTALL, // The extension is being uninstalled. + }; +}; +#endif + class AutocompleteClassifier; class BookmarkModel; class BrowserSignin; @@ -358,7 +370,9 @@ class Profile { virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp( const std::string& app_id) = 0; +#ifndef ANDROID virtual const content::ResourceContext& GetResourceContext() = 0; +#endif // Called by the ExtensionService that lives in this profile. Gives the // profile a chance to react to the load event before the EXTENSION_LOADED -- cgit v1.1