diff options
Diffstat (limited to 'chrome/browser/extensions/api/cookies')
-rw-r--r-- | chrome/browser/extensions/api/cookies/cookies_api.cc | 8 | ||||
-rw-r--r-- | chrome/browser/extensions/api/cookies/cookies_api.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc index 079be55..4a6138c 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc @@ -170,7 +170,7 @@ bool CookiesFunction::ParseStoreContext( Profile* store_profile = NULL; if (!store_id->empty()) { store_profile = cookies_helpers::ChooseProfileFromStoreId( - *store_id, profile(), include_incognito()); + *store_id, GetProfile(), include_incognito()); if (!store_profile) { error_ = ErrorUtils::FormatErrorMessage( keys::kInvalidStoreIdError, *store_id); @@ -513,13 +513,13 @@ void CookiesRemoveFunction::RespondOnUIThread() { } bool CookiesGetAllCookieStoresFunction::RunImpl() { - Profile* original_profile = profile(); + Profile* original_profile = GetProfile(); DCHECK(original_profile); scoped_ptr<base::ListValue> original_tab_ids(new base::ListValue()); Profile* incognito_profile = NULL; scoped_ptr<base::ListValue> incognito_tab_ids; - if (include_incognito() && profile()->HasOffTheRecordProfile()) { - incognito_profile = profile()->GetOffTheRecordProfile(); + if (include_incognito() && GetProfile()->HasOffTheRecordProfile()) { + incognito_profile = GetProfile()->GetOffTheRecordProfile(); if (incognito_profile) incognito_tab_ids.reset(new base::ListValue()); } diff --git a/chrome/browser/extensions/api/cookies/cookies_api.h b/chrome/browser/extensions/api/cookies/cookies_api.h index 8dbc0a4..38e7438 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.h +++ b/chrome/browser/extensions/api/cookies/cookies_api.h @@ -14,8 +14,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" +#include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/extensions/event_router.h" -#include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/net/chrome_cookie_notification_details.h" #include "chrome/common/extensions/api/cookies.h" #include "content/public/browser/notification_observer.h" @@ -67,7 +67,7 @@ class CookiesEventRouter : public content::NotificationObserver { // concurrently accessed from multiple threads. They modify |result_| and other // member variables directly. // See chrome/browser/extensions/extension_function.h for more information. -class CookiesFunction : public AsyncExtensionFunction { +class CookiesFunction : public ChromeAsyncExtensionFunction { protected: virtual ~CookiesFunction() {} |