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/tab_contents | |
| 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/tab_contents')
3 files changed, 2 insertions, 11 deletions
diff --git a/chrome/browser/tab_contents/navigation_metrics_recorder.cc b/chrome/browser/tab_contents/navigation_metrics_recorder.cc index f2ec31c..dd8139c 100644 --- a/chrome/browser/tab_contents/navigation_metrics_recorder.cc +++ b/chrome/browser/tab_contents/navigation_metrics_recorder.cc @@ -8,7 +8,7 @@ #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" -int NavigationMetricsRecorder::kUserDataKey; +DEFINE_WEB_CONTENTS_USER_DATA_KEY(NavigationMetricsRecorder) namespace { diff --git a/chrome/browser/tab_contents/navigation_metrics_recorder.h b/chrome/browser/tab_contents/navigation_metrics_recorder.h index 298caaf..7401eec 100644 --- a/chrome/browser/tab_contents/navigation_metrics_recorder.h +++ b/chrome/browser/tab_contents/navigation_metrics_recorder.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_METRICS_RECORDER_H_ #define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_METRICS_RECORDER_H_ -#include "chrome/browser/tab_contents/web_contents_user_data.h" +#include "chrome/browser/common/web_contents_user_data.h" #include "content/public/browser/web_contents_observer.h" class NavigationMetricsRecorder @@ -16,7 +16,6 @@ class NavigationMetricsRecorder private: explicit NavigationMetricsRecorder(content::WebContents* web_contents); - static int kUserDataKey; friend class WebContentsUserData<NavigationMetricsRecorder>; // content::WebContentsObserver overrides: diff --git a/chrome/browser/tab_contents/web_contents_user_data.h b/chrome/browser/tab_contents/web_contents_user_data.h deleted file mode 100644 index c2a0eb0..0000000 --- a/chrome/browser/tab_contents/web_contents_user_data.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// TODO(avi): Remove this forwarding header once all the patches straggling -// through the CQ are committed. - -#include "chrome/browser/common/web_contents_user_data.h" |