From 2eedcde91444359d133193596daa7e0d5a5202fe Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 25 Oct 2018 20:19:16 +0530 Subject: [PATCH] fix: Remove DEFINE_WEB_CONTENTS_USER_DATA_KEY in //electron. https://bugs.chromium.org/p/chromium/issues/detail?id=589840 --- atom/browser/api/atom_api_web_contents_view.cc | 2 -- atom/browser/web_contents_permission_helper.cc | 2 -- atom/browser/web_contents_preferences.cc | 2 -- atom/browser/web_contents_zoom_controller.cc | 2 -- 4 files changed, 8 deletions(-) diff --git a/atom/browser/api/atom_api_web_contents_view.cc b/atom/browser/api/atom_api_web_contents_view.cc index f0f45da98a89..82468929db6c 100644 --- a/atom/browser/api/atom_api_web_contents_view.cc +++ b/atom/browser/api/atom_api_web_contents_view.cc @@ -36,8 +36,6 @@ class WebContentsViewRelay } // namespace -DEFINE_WEB_CONTENTS_USER_DATA_KEY(WebContentsViewRelay); - namespace atom { namespace api { diff --git a/atom/browser/web_contents_permission_helper.cc b/atom/browser/web_contents_permission_helper.cc index b9533e481bbb..ebea4eba82a5 100644 --- a/atom/browser/web_contents_permission_helper.cc +++ b/atom/browser/web_contents_permission_helper.cc @@ -14,8 +14,6 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" -DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::WebContentsPermissionHelper); - namespace { std::string MediaStreamTypeToString(content::MediaStreamType type) { diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc index fd0112d6b7b6..405cdabba9b1 100644 --- a/atom/browser/web_contents_preferences.cc +++ b/atom/browser/web_contents_preferences.cc @@ -30,8 +30,6 @@ #include "ui/gfx/switches.h" #endif -DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::WebContentsPreferences); - namespace { bool GetAsString(const base::Value* val, diff --git a/atom/browser/web_contents_zoom_controller.cc b/atom/browser/web_contents_zoom_controller.cc index 35b8e4635cff..a809544984ef 100644 --- a/atom/browser/web_contents_zoom_controller.cc +++ b/atom/browser/web_contents_zoom_controller.cc @@ -15,8 +15,6 @@ #include "content/public/common/page_zoom.h" #include "net/base/url_util.h" -DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::WebContentsZoomController); - namespace atom { WebContentsZoomController::WebContentsZoomController(