summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/alternate_error_tab_observer.cc2
-rw-r--r--chrome/browser/ui/alternate_error_tab_observer.h1
-rw-r--r--chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc2
-rw-r--r--chrome/browser/ui/blocked_content/blocked_content_tab_helper.h1
-rw-r--r--chrome/browser/ui/bookmarks/bookmark_tab_helper.cc2
-rw-r--r--chrome/browser/ui/bookmarks/bookmark_tab_helper.h1
-rw-r--r--chrome/browser/ui/hung_plugin_tab_helper.cc2
-rw-r--r--chrome/browser/ui/hung_plugin_tab_helper.h1
-rw-r--r--chrome/browser/ui/intents/web_intent_picker_controller.cc2
-rw-r--r--chrome/browser/ui/intents/web_intent_picker_controller.h1
-rw-r--r--chrome/browser/ui/metro_pin_tab_helper.cc2
-rw-r--r--chrome/browser/ui/metro_pin_tab_helper.h1
-rw-r--r--chrome/browser/ui/pdf/pdf_tab_helper.cc2
-rw-r--r--chrome/browser/ui/pdf/pdf_tab_helper.h1
-rw-r--r--chrome/browser/ui/sad_tab_helper.cc2
-rw-r--r--chrome/browser/ui/sad_tab_helper.h1
-rw-r--r--chrome/browser/ui/search/search_tab_helper.cc2
-rw-r--r--chrome/browser/ui/search/search_tab_helper.h1
-rw-r--r--chrome/browser/ui/search_engines/search_engine_tab_helper.cc2
-rw-r--r--chrome/browser/ui/search_engines/search_engine_tab_helper.h1
-rw-r--r--chrome/browser/ui/snapshot_tab_helper.cc2
-rw-r--r--chrome/browser/ui/snapshot_tab_helper.h1
-rw-r--r--chrome/browser/ui/sync/one_click_signin_helper.cc2
-rw-r--r--chrome/browser/ui/sync/one_click_signin_helper.h1
-rw-r--r--chrome/browser/ui/tab_contents/core_tab_helper.cc2
-rw-r--r--chrome/browser/ui/tab_contents/core_tab_helper.h1
-rw-r--r--chrome/browser/ui/zoom/zoom_controller.cc2
-rw-r--r--chrome/browser/ui/zoom/zoom_controller.h1
28 files changed, 14 insertions, 28 deletions
diff --git a/chrome/browser/ui/alternate_error_tab_observer.cc b/chrome/browser/ui/alternate_error_tab_observer.cc
index 56ce220..73347f4 100644
--- a/chrome/browser/ui/alternate_error_tab_observer.cc
+++ b/chrome/browser/ui/alternate_error_tab_observer.cc
@@ -16,7 +16,7 @@
using content::RenderViewHost;
using content::WebContents;
-int AlternateErrorPageTabObserver::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(AlternateErrorPageTabObserver)
AlternateErrorPageTabObserver::AlternateErrorPageTabObserver(
WebContents* web_contents)
diff --git a/chrome/browser/ui/alternate_error_tab_observer.h b/chrome/browser/ui/alternate_error_tab_observer.h
index e67770f..9bd116ecdf 100644
--- a/chrome/browser/ui/alternate_error_tab_observer.h
+++ b/chrome/browser/ui/alternate_error_tab_observer.h
@@ -26,7 +26,6 @@ class AlternateErrorPageTabObserver
private:
explicit AlternateErrorPageTabObserver(content::WebContents* web_contents);
- static int kUserDataKey;
friend class WebContentsUserData<AlternateErrorPageTabObserver>;
// content::WebContentsObserver overrides:
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 e005ba7..b1672ae 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;
-int BlockedContentTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(BlockedContentTabHelper)
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 88b14a1..c07c8ca 100644
--- a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h
+++ b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h
@@ -62,7 +62,6 @@ 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.
diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
index e2b08fe..0226cfb 100644
--- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
@@ -16,7 +16,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/web_contents.h"
-int BookmarkTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(BookmarkTabHelper)
namespace {
diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
index 022a414..4024a82 100644
--- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
+++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
@@ -66,7 +66,6 @@ class BookmarkTabHelper : public content::NotificationObserver,
private:
explicit BookmarkTabHelper(content::WebContents* web_contents);
- static int kUserDataKey;
friend class WebContentsUserData<BookmarkTabHelper>;
// Updates the starred state from the bookmark bar model. If the state has
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc
index 26dc863..8dd7257 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.cc
+++ b/chrome/browser/ui/hung_plugin_tab_helper.cc
@@ -36,7 +36,7 @@
#include "chrome/browser/hang_monitor/hang_crash_dump_win.h"
#endif
-int HungPluginTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(HungPluginTabHelper)
namespace {
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.h b/chrome/browser/ui/hung_plugin_tab_helper.h
index bdf6a60..3518739 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.h
+++ b/chrome/browser/ui/hung_plugin_tab_helper.h
@@ -51,7 +51,6 @@ class HungPluginTabHelper : public content::WebContentsObserver,
private:
explicit HungPluginTabHelper(content::WebContents* contents);
- static int kUserDataKey;
friend class WebContentsUserData<HungPluginTabHelper>;
class InfoBarDelegate;
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index 51f78f0..bdba7c8 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -57,7 +57,7 @@
using extensions::WebstoreInstaller;
-int WebIntentPickerController::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(WebIntentPickerController)
namespace {
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.h b/chrome/browser/ui/intents/web_intent_picker_controller.h
index d5bf823..6f479bb 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.h
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.h
@@ -120,7 +120,6 @@ class WebIntentPickerController
private:
explicit WebIntentPickerController(content::WebContents* web_contents);
- static int kUserDataKey;
friend class WebContentsUserData<WebIntentPickerController>;
friend class WebIntentPickerControllerTest;
diff --git a/chrome/browser/ui/metro_pin_tab_helper.cc b/chrome/browser/ui/metro_pin_tab_helper.cc
index 187e44d..7644355 100644
--- a/chrome/browser/ui/metro_pin_tab_helper.cc
+++ b/chrome/browser/ui/metro_pin_tab_helper.cc
@@ -12,7 +12,7 @@
#include "base/win/metro.h"
#endif
-int MetroPinTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(MetroPinTabHelper)
MetroPinTabHelper::MetroPinTabHelper(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents),
diff --git a/chrome/browser/ui/metro_pin_tab_helper.h b/chrome/browser/ui/metro_pin_tab_helper.h
index a78af83..450c8e3f 100644
--- a/chrome/browser/ui/metro_pin_tab_helper.h
+++ b/chrome/browser/ui/metro_pin_tab_helper.h
@@ -25,7 +25,6 @@ class MetroPinTabHelper : public content::WebContentsObserver,
private:
explicit MetroPinTabHelper(content::WebContents* tab_contents);
- static int kUserDataKey;
friend class WebContentsUserData<MetroPinTabHelper>;
// Queries the metro driver about the pinned state of the current URL.
diff --git a/chrome/browser/ui/pdf/pdf_tab_helper.cc b/chrome/browser/ui/pdf/pdf_tab_helper.cc
index 5b4ad47..161a2e9 100644
--- a/chrome/browser/ui/pdf/pdf_tab_helper.cc
+++ b/chrome/browser/ui/pdf/pdf_tab_helper.cc
@@ -13,7 +13,7 @@
#include "chrome/common/render_messages.h"
#include "content/public/browser/navigation_details.h"
-int PDFTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(PDFTabHelper)
PDFTabHelper::PDFTabHelper(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {
diff --git a/chrome/browser/ui/pdf/pdf_tab_helper.h b/chrome/browser/ui/pdf/pdf_tab_helper.h
index a7d51c9..17ad5ef 100644
--- a/chrome/browser/ui/pdf/pdf_tab_helper.h
+++ b/chrome/browser/ui/pdf/pdf_tab_helper.h
@@ -19,7 +19,6 @@ class WebContents;
class PDFTabHelper : public content::WebContentsObserver,
public WebContentsUserData<PDFTabHelper> {
public:
- static int kUserDataKey;
explicit PDFTabHelper(content::WebContents* web_contents);
virtual ~PDFTabHelper();
diff --git a/chrome/browser/ui/sad_tab_helper.cc b/chrome/browser/ui/sad_tab_helper.cc
index a7d5c49..07fcacd 100644
--- a/chrome/browser/ui/sad_tab_helper.cc
+++ b/chrome/browser/ui/sad_tab_helper.cc
@@ -24,7 +24,7 @@
#include "chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.h"
#endif
-int SadTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(SadTabHelper)
SadTabHelper::SadTabHelper(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {
diff --git a/chrome/browser/ui/sad_tab_helper.h b/chrome/browser/ui/sad_tab_helper.h
index 6b9c650..a05adf7 100644
--- a/chrome/browser/ui/sad_tab_helper.h
+++ b/chrome/browser/ui/sad_tab_helper.h
@@ -43,7 +43,6 @@ class SadTabHelper : public content::WebContentsObserver,
private:
explicit SadTabHelper(content::WebContents* web_contents);
- static int kUserDataKey;
friend class WebContentsUserData<SadTabHelper>;
// Platform specific function to get an instance of the sad tab page.
diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc
index 3f59cfc..7bdaa49 100644
--- a/chrome/browser/ui/search/search_tab_helper.cc
+++ b/chrome/browser/ui/search/search_tab_helper.cc
@@ -16,7 +16,7 @@
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
-int chrome::search::SearchTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(chrome::search::SearchTabHelper)
namespace {
diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h
index cae2906..f47889c 100644
--- a/chrome/browser/ui/search/search_tab_helper.h
+++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -60,7 +60,6 @@ class SearchTabHelper : public content::WebContentsObserver,
private:
explicit SearchTabHelper(content::WebContents* web_contents);
- static int kUserDataKey;
friend class WebContentsUserData<SearchTabHelper>;
// Enum of the load states for the NTP.
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
index 4a94756..09e7bcb 100644
--- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
@@ -23,7 +23,7 @@ using content::NavigationController;
using content::NavigationEntry;
using content::WebContents;
-int SearchEngineTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(SearchEngineTabHelper)
namespace {
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.h b/chrome/browser/ui/search_engines/search_engine_tab_helper.h
index fecd7db..244616c 100644
--- a/chrome/browser/ui/search_engines/search_engine_tab_helper.h
+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.h
@@ -32,7 +32,6 @@ class SearchEngineTabHelper
private:
explicit SearchEngineTabHelper(content::WebContents* web_contents);
- static int kUserDataKey;
friend class WebContentsUserData<SearchEngineTabHelper>;
// Handles when a page specifies an OSDD (OpenSearch Description Document).
diff --git a/chrome/browser/ui/snapshot_tab_helper.cc b/chrome/browser/ui/snapshot_tab_helper.cc
index 891c3d5..b6848f9 100644
--- a/chrome/browser/ui/snapshot_tab_helper.cc
+++ b/chrome/browser/ui/snapshot_tab_helper.cc
@@ -11,7 +11,7 @@
using content::WebContents;
-int SnapshotTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(SnapshotTabHelper)
SnapshotTabHelper::SnapshotTabHelper(WebContents* web_contents)
: content::WebContentsObserver(web_contents) {
diff --git a/chrome/browser/ui/snapshot_tab_helper.h b/chrome/browser/ui/snapshot_tab_helper.h
index 6d943bc..a9d9eb1 100644
--- a/chrome/browser/ui/snapshot_tab_helper.h
+++ b/chrome/browser/ui/snapshot_tab_helper.h
@@ -21,7 +21,6 @@ class SnapshotTabHelper : public content::WebContentsObserver,
private:
explicit SnapshotTabHelper(content::WebContents* web_contents);
- static int kUserDataKey;
friend class WebContentsUserData<SnapshotTabHelper>;
// content::WebContentsObserver overrides:
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index b63d7c5..bf9472b 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -48,7 +48,7 @@
#include "webkit/forms/password_form.h"
#include "webkit/forms/password_form_dom_manager.h"
-int OneClickSigninHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(OneClickSigninHelper)
namespace {
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.h b/chrome/browser/ui/sync/one_click_signin_helper.h
index 225b679..295eca0 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.h
+++ b/chrome/browser/ui/sync/one_click_signin_helper.h
@@ -50,7 +50,6 @@ class OneClickSigninHelper : public content::WebContentsObserver,
private:
explicit OneClickSigninHelper(content::WebContents* web_contents);
- static int kUserDataKey;
friend class WebContentsUserData<OneClickSigninHelper>;
// The portion of ShowInfoBarIfPossible() that needs to run on the UI thread.
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc
index 1cfa992..8894328d 100644
--- a/chrome/browser/ui/tab_contents/core_tab_helper.cc
+++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc
@@ -15,7 +15,7 @@
using content::WebContents;
-int CoreTabHelper::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(CoreTabHelper)
CoreTabHelper::CoreTabHelper(WebContents* web_contents)
: content::WebContentsObserver(web_contents),
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.h b/chrome/browser/ui/tab_contents/core_tab_helper.h
index ea3f048..53389f8 100644
--- a/chrome/browser/ui/tab_contents/core_tab_helper.h
+++ b/chrome/browser/ui/tab_contents/core_tab_helper.h
@@ -27,7 +27,6 @@ class CoreTabHelper : public content::WebContentsObserver,
private:
explicit CoreTabHelper(content::WebContents* web_contents);
- static int kUserDataKey;
friend class WebContentsUserData<CoreTabHelper>;
// content::WebContentsObserver overrides:
diff --git a/chrome/browser/ui/zoom/zoom_controller.cc b/chrome/browser/ui/zoom/zoom_controller.cc
index 8bb8494..66ba5ee 100644
--- a/chrome/browser/ui/zoom/zoom_controller.cc
+++ b/chrome/browser/ui/zoom/zoom_controller.cc
@@ -19,7 +19,7 @@
#include "grit/theme_resources.h"
#include "net/base/net_util.h"
-int ZoomController::kUserDataKey;
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(ZoomController)
ZoomController::ZoomController(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents),
diff --git a/chrome/browser/ui/zoom/zoom_controller.h b/chrome/browser/ui/zoom/zoom_controller.h
index b37c114..02b10bb 100644
--- a/chrome/browser/ui/zoom/zoom_controller.h
+++ b/chrome/browser/ui/zoom/zoom_controller.h
@@ -38,7 +38,6 @@ class ZoomController : public content::NotificationObserver,
private:
explicit ZoomController(content::WebContents* web_contents);
- static int kUserDataKey;
friend class WebContentsUserData<ZoomController>;
// content::WebContentsObserver overrides:
generated by cgit v1.1 at 2025-04-01 02:56:52 +0000