diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-06 22:57:49 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:08 +0100 |
| commit | d26447072f93114b19c75ae32e18a68487125c0c (patch) | |
| tree | b29d8305a4934d524ee8949eea43db47253bd28c /chrome | |
| parent | 7ecce71451c3b15ba37cebc89499b4aee5433c7b (diff) | |
| download | external_chromium-d26447072f93114b19c75ae32e18a68487125c0c.zip external_chromium-d26447072f93114b19c75ae32e18a68487125c0c.tar.gz external_chromium-d26447072f93114b19c75ae32e18a68487125c0c.tar.bz2 | |
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
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/profiles/profile.h | 14 |
1 files changed, 14 insertions, 0 deletions
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 |