diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 17:10:05 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 17:10:05 +0000 |
| commit | ad4c6ff09282846c73ad201f5769c744aca574b7 (patch) | |
| tree | af5e3c9ff4c3f8e876b70c88f8d13a2c4f423e62 /chrome/browser/captive_portal | |
| parent | 2860a1f4a8fffd36b47eaace3b86cf06cc3faa2e (diff) | |
| download | chromium_src-ad4c6ff09282846c73ad201f5769c744aca574b7.zip chromium_src-ad4c6ff09282846c73ad201f5769c744aca574b7.tar.gz chromium_src-ad4c6ff09282846c73ad201f5769c744aca574b7.tar.bz2 | |
Revert "Revert 159158 - Make using WebContentsUserData simpler."
This reverts commit r159277.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/captive_portal')
| -rw-r--r-- | chrome/browser/captive_portal/captive_portal_tab_helper.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/captive_portal/captive_portal_tab_helper.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.cc b/chrome/browser/captive_portal/captive_portal_tab_helper.cc index 4108f12b2..797ab24 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper.cc +++ b/chrome/browser/captive_portal/captive_portal_tab_helper.cc @@ -25,9 +25,9 @@ #include "net/base/net_errors.h" #include "net/base/ssl_info.h" -namespace captive_portal { +DEFINE_WEB_CONTENTS_USER_DATA_KEY(captive_portal::CaptivePortalTabHelper) -int CaptivePortalTabHelper::kUserDataKey; +namespace captive_portal { CaptivePortalTabHelper::CaptivePortalTabHelper( content::WebContents* web_contents) diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.h b/chrome/browser/captive_portal/captive_portal_tab_helper.h index 9ddf554..c515874 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper.h +++ b/chrome/browser/captive_portal/captive_portal_tab_helper.h @@ -104,7 +104,6 @@ class CaptivePortalTabHelper friend class CaptivePortalTabHelperTest; friend class WebContentsUserData<CaptivePortalTabHelper>; - static int kUserDataKey; explicit CaptivePortalTabHelper(content::WebContents* web_contents); // Called by Observe in response to the corresponding event. |