Merge pull request #601 from brave/OnMainFrameReadyToCommitNavigation…

…-Crash Explicitly calling `ExtensionWebContentsObserver::Initialize`
brave · May 30, 2018 · fa2decc · fa2decc
2 parents 7c92450 + 56d6356
commit fa2decc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/atom/browser/extensions/atom_extension_web_contents_observer.cc b/atom/browser/extensions/atom_extension_web_contents_observer.cc
@@ -29,6 +29,15 @@ AtomExtensionWebContentsObserver::AtomExtensionWebContentsObserver(
 
 AtomExtensionWebContentsObserver::~AtomExtensionWebContentsObserver() {}
 
+void AtomExtensionWebContentsObserver::CreateForWebContents(
+    content::WebContents* web_contents) {
+  content::WebContentsUserData<
+    AtomExtensionWebContentsObserver>::CreateForWebContents(web_contents);
+
+  // Initialize this instance if necessary.
+  FromWebContents(web_contents)->Initialize();
+}
+
 void AtomExtensionWebContentsObserver::RenderFrameCreated(
     content::RenderFrameHost* render_frame_host) {
   ExtensionWebContentsObserver::RenderFrameCreated(render_frame_host);

diff --git a/atom/browser/extensions/atom_extension_web_contents_observer.h b/atom/browser/extensions/atom_extension_web_contents_observer.h
@@ -24,6 +24,10 @@ class AtomExtensionWebContentsObserver
  public:
   ~AtomExtensionWebContentsObserver() override;
 
+  // Creates and initializes an instance of this class for the given
+  // |web_contents|, if it doesn't already exist.
+  static void CreateForWebContents(content::WebContents* web_contents);
+
  private:
   friend class content::WebContentsUserData<AtomExtensionWebContentsObserver>;