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/ui/blocked_content | |
| 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/ui/blocked_content')
| -rw-r--r-- | chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/blocked_content/blocked_content_tab_helper.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc index b1672ae..e005ba7 100644 --- a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc +++ b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc @@ -23,7 +23,7 @@ using content::NavigationEntry; -DEFINE_WEB_CONTENTS_USER_DATA_KEY(BlockedContentTabHelper) +int BlockedContentTabHelper::kUserDataKey; BlockedContentTabHelper::BlockedContentTabHelper( content::WebContents* web_contents) diff --git a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h index c07c8ca..88b14a1 100644 --- a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h +++ b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h @@ -62,6 +62,7 @@ class BlockedContentTabHelper private: explicit BlockedContentTabHelper(content::WebContents* web_contents); + static int kUserDataKey; friend class WebContentsUserData<BlockedContentTabHelper>; // Called when the blocked popup notification is shown or hidden. |