diff options
| author | rockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 15:06:45 +0000 |
|---|---|---|
| committer | rockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 15:06:45 +0000 |
| commit | 659be688fc57bccd965cb8f7a7e6b3f7f248b9a7 (patch) | |
| tree | 1ebb50ab7b35f2ae7620d90fb9ebb47347f75e3f /chrome/browser/extensions/api/usb/usb_api.cc | |
| parent | 065b657bd16bca7115b20774a154808184848045 (diff) | |
| download | chromium_src-659be688fc57bccd965cb8f7a7e6b3f7f248b9a7.zip chromium_src-659be688fc57bccd965cb8f7a7e6b3f7f248b9a7.tar.gz chromium_src-659be688fc57bccd965cb8f7a7e6b3f7f248b9a7.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/extensions/api/usb/usb_api.cc')
| -rw-r--r-- | chrome/browser/extensions/api/usb/usb_api.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/extensions/api/usb/usb_api.cc b/chrome/browser/extensions/api/usb/usb_api.cc index 84474e4..4d2e46e 100644 --- a/chrome/browser/extensions/api/usb/usb_api.cc +++ b/chrome/browser/extensions/api/usb/usb_api.cc @@ -10,7 +10,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop_proxy.h" #include "chrome/browser/extensions/api/usb/usb_device_resource.h" -#include "chrome/browser/profiles/profile.h" #include "chrome/browser/usb/usb_device_handle.h" #include "chrome/browser/usb/usb_service.h" #include "chrome/common/extensions/api/usb.h" @@ -396,7 +395,7 @@ UsbAsyncApiFunction::~UsbAsyncApiFunction() { } bool UsbAsyncApiFunction::PrePrepare() { - manager_ = ApiResourceManager<UsbDeviceResource>::Get(GetProfile()); + manager_ = ApiResourceManager<UsbDeviceResource>::Get(browser_context()); set_work_thread_id(BrowserThread::FILE); return manager_ != NULL; } |