From 659be688fc57bccd965cb8f7a7e6b3f7f248b9a7 Mon Sep 17 00:00:00 2001 From: "rockot@chromium.org" Date: Fri, 28 Feb 2014 15:06:45 +0000 Subject: Pull AsyncApiFunction out of src/chrome AsyncApiFunction now inherits UIThreadExtensionFunction directly, rather than depending on ChromeAsyncExtensionFunction. It's also been moved from chrome/browser/extensions/api/api_function.{h,cc} to extensions/browser/api/async_api_function.{h,cc}. With the exception of notifications API functions, anything which previously depended on AsyncApiFunction's inheritance of ChromeAsyncExtensionFunction was doing so only for GetProfile. In all cases, GetProfile() has been replaced with ExtensionFunction::browser_context() (renamed from context()). Finally, ApiFunction has been removed since it was identical to ChromeAsyncExtensionFunction. BUG=346949 TBR=dmazzoni@chromium.org,mfoltz@chromium.org,fgorski@chromium.org,courage@chromium.org,dewittj@chromium.org,rpaquay@chromium.org,kalman@chromium.org Review URL: https://codereview.chromium.org/177003015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254113 0039d316-1c4b-4281-b951-d872f2087c98 --- extensions/browser/extension_function.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'extensions/browser/extension_function.h') diff --git a/extensions/browser/extension_function.h b/extensions/browser/extension_function.h index 099dff1..b0af0ae 100644 --- a/extensions/browser/extension_function.h +++ b/extensions/browser/extension_function.h @@ -302,8 +302,10 @@ class UIThreadExtensionFunction : public ExtensionFunction { // Set the browser context which contains the extension that has originated // this function call. - void set_context(content::BrowserContext* context) { context_ = context; } - content::BrowserContext* context() const { return context_; } + void set_browser_context(content::BrowserContext* context) { + context_ = context; + } + content::BrowserContext* browser_context() const { return context_; } void SetRenderViewHost(content::RenderViewHost* render_view_host); content::RenderViewHost* render_view_host() const { -- cgit v1.1