refactor: rename managed_web_contents to inspectable_web_contents (#2…

…6525)
electron · Nov 17, 2020 · b8372fd · b8372fd
1 parent 29211a5
commit b8372fd
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 83 deletions.
diff --git a/shell/browser/api/electron_api_browser_view.cc b/shell/browser/api/electron_api_browser_view.cc
@@ -87,7 +87,7 @@ BrowserView::BrowserView(gin::Arguments* args,
   Observe(web_contents->web_contents());
 
   view_.reset(
-      NativeBrowserView::Create(api_web_contents_->managed_web_contents()));
+      NativeBrowserView::Create(api_web_contents_->inspectable_web_contents()));
 }
 
 BrowserView::~BrowserView() {

diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc
@@ -95,7 +95,8 @@ BrowserWindow::BrowserWindow(gin::Arguments* args,
   SetContentView(gin::CreateHandle<View>(isolate, web_contents_view.get()));
 
 #if defined(OS_MAC)
-  OverrideNSWindowContentView(web_contents->managed_web_contents());
+  OverrideNSWindowContentView(
+      web_contents->inspectable_web_contents()->GetView());
 #endif
 
   // Init window after everything has been setup.

diff --git a/shell/browser/api/electron_api_browser_window.h b/shell/browser/api/electron_api_browser_window.h
@@ -97,7 +97,7 @@ class BrowserWindow : public BaseWindow,
 
  private:
 #if defined(OS_MAC)
-  void OverrideNSWindowContentView(InspectableWebContents* iwc);
+  void OverrideNSWindowContentView(InspectableWebContentsView* webView);
 #endif
 
   // Helpers.

diff --git a/shell/browser/api/electron_api_browser_window_mac.mm b/shell/browser/api/electron_api_browser_window_mac.mm
@@ -19,11 +19,12 @@
 
 namespace api {
 
-void BrowserWindow::OverrideNSWindowContentView(InspectableWebContents* iwc) {
+void BrowserWindow::OverrideNSWindowContentView(
+    InspectableWebContentsView* view) {
   // Make NativeWindow use a NSView as content view.
   static_cast<NativeWindowMac*>(window())->OverrideNSWindowContentView();
   // Add webview to contentView.
-  NSView* webView = iwc->GetView()->GetNativeView().GetNativeNSView();
+  NSView* webView = view->GetNativeView().GetNativeNSView();
   NSView* contentView =
       [window()->GetNativeWindow().GetNativeNSWindow() contentView];
   [webView setFrame:[contentView bounds]];