diff options
| author | dharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 17:00:14 +0000 |
|---|---|---|
| committer | dharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 17:00:14 +0000 |
| commit | 3f735995e6a2ed67cb0d4b01b50b058da1179a38 (patch) | |
| tree | bfb3cb8f485e29ad302662c2662f5374c4df3b5e /chrome/browser/extensions/api | |
| parent | 05adeba6452d76ab39c0c407660df9ec4291e0f7 (diff) | |
| download | chromium_src-3f735995e6a2ed67cb0d4b01b50b058da1179a38.zip chromium_src-3f735995e6a2ed67cb0d4b01b50b058da1179a38.tar.gz chromium_src-3f735995e6a2ed67cb0d4b01b50b058da1179a38.tar.bz2 | |
Revert 159158 - Make using WebContentsUserData simpler.
BUG=107201
TEST=no visible change
Reverted due to bug 152950
Review URL: https://chromiumcodereview.appspot.com/10993064
TBR=avi@chromium.org
Review URL: https://codereview.chromium.org/10990113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api')
| -rw-r--r-- | chrome/browser/extensions/api/web_navigation/web_navigation_api.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/web_navigation/web_navigation_api.h | 1 |
2 files changed, 3 insertions, 2 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 |