diff options
Diffstat (limited to 'chrome/browser/extensions')
4 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc index 1b1e2f1..ed19fcf 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -31,8 +31,6 @@ namespace GetFrame = extensions::api::web_navigation::GetFrame; namespace GetAllFrames = extensions::api::web_navigation::GetAllFrames; -DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::WebNavigationTabObserver) - namespace extensions { namespace helpers = web_navigation_api_helpers; @@ -255,6 +253,8 @@ void WebNavigationEventRouter::TabDestroyed(content::WebContents* tab) { // WebNavigationTabObserver ------------------------------------------ +int WebNavigationTabObserver::kUserDataKey; + WebNavigationTabObserver::WebNavigationTabObserver( content::WebContents* web_contents) : WebContentsObserver(web_contents), diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h index 6503a72..196a785 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h @@ -97,6 +97,7 @@ class WebNavigationTabObserver private: explicit WebNavigationTabObserver(content::WebContents* web_contents); + static int kUserDataKey; friend class WebContentsUserData<WebNavigationTabObserver>; // True if the transition and target url correspond to a reference fragment diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc index bd0a74f..4c5521f 100644 --- a/chrome/browser/extensions/tab_helper.cc +++ b/chrome/browser/extensions/tab_helper.cc @@ -45,8 +45,6 @@ using content::NavigationEntry; using content::RenderViewHost; using content::WebContents; -DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::TabHelper) - namespace { const char kPermissionError[] = "permission_error"; @@ -55,6 +53,8 @@ const char kPermissionError[] = "permission_error"; namespace extensions { +int TabHelper::kUserDataKey; + TabHelper::ContentScriptObserver::ContentScriptObserver(TabHelper* tab_helper) : tab_helper_(tab_helper) { tab_helper_->AddContentScriptObserver(this); diff --git a/chrome/browser/extensions/tab_helper.h b/chrome/browser/extensions/tab_helper.h index ed5563f..9540029 100644 --- a/chrome/browser/extensions/tab_helper.h +++ b/chrome/browser/extensions/tab_helper.h @@ -145,6 +145,7 @@ class TabHelper : public content::WebContentsObserver, private: explicit TabHelper(content::WebContents* web_contents); + static int kUserDataKey; friend class WebContentsUserData<TabHelper>; // content::WebContentsObserver overrides. |