refactor: rename InspectableWebContents{Impl =>} (#24543)

filenames.gni

@@ -356,8 +356,6 @@ filenames = {
     "shell/browser/ui/inspectable_web_contents.cc",
     "shell/browser/ui/inspectable_web_contents.h",
     "shell/browser/ui/inspectable_web_contents_delegate.h",
-    "shell/browser/ui/inspectable_web_contents_impl.cc",
-    "shell/browser/ui/inspectable_web_contents_impl.h",
     "shell/browser/ui/inspectable_web_contents_view.h",
     "shell/browser/ui/inspectable_web_contents_view_delegate.cc",
     "shell/browser/ui/inspectable_web_contents_view_delegate.h",

shell/browser/common_web_contents_delegate.cc

@@ -215,7 +215,7 @@ void CommonWebContentsDelegate::InitWithWebContents(
       web_preferences && web_preferences->IsEnabled(options::kOffscreen);
 
   // Create InspectableWebContents.
-  web_contents_.reset(InspectableWebContents::Create(
+  web_contents_.reset(new InspectableWebContents(
       web_contents, browser_context->prefs(), is_guest));
   web_contents_->SetDelegate(this);
 }

shell/browser/common_web_contents_delegate.h

@@ -14,8 +14,8 @@
 #include "chrome/browser/devtools/devtools_file_system_indexer.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "electron/buildflags/buildflags.h"
+#include "shell/browser/ui/inspectable_web_contents.h"
 #include "shell/browser/ui/inspectable_web_contents_delegate.h"
-#include "shell/browser/ui/inspectable_web_contents_impl.h"
 #include "shell/browser/ui/inspectable_web_contents_view_delegate.h"
 
 namespace base {

shell/browser/electron_browser_context.cc

@@ -43,7 +43,7 @@
 #include "shell/browser/pref_store_delegate.h"
 #include "shell/browser/protocol_registry.h"
 #include "shell/browser/special_storage_policy.h"
-#include "shell/browser/ui/inspectable_web_contents_impl.h"
+#include "shell/browser/ui/inspectable_web_contents.h"
 #include "shell/browser/web_view_manager.h"
 #include "shell/browser/zoom_level_delegate.h"
 #include "shell/common/application_info.h"
@@ -195,7 +195,7 @@ void ElectronBrowserContext::InitPrefs() {
   registry->RegisterFilePathPref(prefs::kDownloadDefaultDirectory,
                                  download_dir);
   registry->RegisterDictionaryPref(prefs::kDevToolsFileSystemPaths);
-  InspectableWebContentsImpl::RegisterPrefs(registry.get());
+  InspectableWebContents::RegisterPrefs(registry.get());
   MediaDeviceIDSalt::RegisterPrefs(registry.get());
   ZoomLevelDelegate::RegisterPrefs(registry.get());
   PrefProxyConfigTrackerImpl::RegisterPrefs(registry.get());

shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm

@@ -6,7 +6,7 @@
 
 #include "content/public/browser/render_widget_host_view.h"
 #include "shell/browser/ui/cocoa/event_dispatching_window.h"
-#include "shell/browser/ui/inspectable_web_contents_impl.h"
+#include "shell/browser/ui/inspectable_web_contents.h"
 #include "shell/browser/ui/inspectable_web_contents_view_delegate.h"
 #include "shell/browser/ui/inspectable_web_contents_view_mac.h"
 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"

shell/browser/ui/inspectable_web_contents.h

@@ -6,59 +6,235 @@
 #ifndef SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
 #define SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
 
+#include <list>
+#include <map>
+#include <memory>
+#include <set>
 #include <string>
+#include <vector>
 
-#include "content/public/browser/web_contents.h"
+#include "base/containers/span.h"
-
+#include "base/containers/unique_ptr_adapters.h"
-namespace base {
+#include "base/memory/weak_ptr.h"
-class Value;
+#include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
-}
+#include "chrome/browser/devtools/devtools_embedder_message_dispatcher.h"
-
+#include "content/public/browser/devtools_agent_host.h"
-namespace content {
+#include "content/public/browser/devtools_frontend_host.h"
-class DevToolsAgentHost;
+#include "content/public/browser/web_contents_delegate.h"
-}
+#include "content/public/browser/web_contents_observer.h"
+#include "electron/buildflags/buildflags.h"
+#include "shell/browser/ui/inspectable_web_contents.h"
+#include "ui/gfx/geometry/rect.h"
 
 class PrefService;
+class PrefRegistrySimple;
 
 namespace electron {
 
 class InspectableWebContentsDelegate;
 class InspectableWebContentsView;
 
-// TODO(zcbenz): Remove this abstract wrapper and rename
+class InspectableWebContents
-// InspectableWebContentsImpl to InspectableWebContents instead.
+    : public content::DevToolsAgentHostClient,
-class InspectableWebContents {
+      public content::WebContentsObserver,
+      public content::WebContentsDelegate,
+      public DevToolsEmbedderMessageDispatcher::Delegate {
  public:
-  // The returned InspectableWebContents takes ownership of the passed-in
+  using List = std::list<InspectableWebContents*>;
-  // WebContents.
-  static InspectableWebContents* Create(content::WebContents* web_contents,
-                                        PrefService* pref_service,
-                                        bool is_guest);
 
-  virtual ~InspectableWebContents() {}
+  static const List& GetAll();
+  static void RegisterPrefs(PrefRegistrySimple* pref_registry);
 
-  virtual InspectableWebContentsView* GetView() const = 0;
+  InspectableWebContents(content::WebContents* web_contents,
-  virtual content::WebContents* GetWebContents() const = 0;
+                         PrefService* pref_service,
-  virtual content::WebContents* GetDevToolsWebContents() const = 0;
+                         bool is_guest);
+  ~InspectableWebContents() override;
 
-  // The delegate manages its own life.
+  InspectableWebContentsView* GetView() const;
-  virtual void SetDelegate(InspectableWebContentsDelegate* delegate) = 0;
+  content::WebContents* GetWebContents() const;
-  virtual InspectableWebContentsDelegate* GetDelegate() const = 0;
+  content::WebContents* GetDevToolsWebContents() const;
 
-  virtual bool IsGuest() const = 0;
+  void SetDelegate(InspectableWebContentsDelegate* delegate);
-  virtual void ReleaseWebContents() = 0;
+  InspectableWebContentsDelegate* GetDelegate() const;
-  virtual void SetDevToolsWebContents(content::WebContents* devtools) = 0;
+  bool IsGuest() const;
-  virtual void SetDockState(const std::string& state) = 0;
+  void ReleaseWebContents();
-  virtual void ShowDevTools(bool activate) = 0;
+  void SetDevToolsWebContents(content::WebContents* devtools);
-  virtual void CloseDevTools() = 0;
+  void SetDockState(const std::string& state);
-  virtual bool IsDevToolsViewShowing() = 0;
+  void ShowDevTools(bool activate);
-  virtual void AttachTo(scoped_refptr<content::DevToolsAgentHost>) = 0;
+  void CloseDevTools();
-  virtual void Detach() = 0;
+  bool IsDevToolsViewShowing();
-  virtual void CallClientFunction(const std::string& function_name,
+  void AttachTo(scoped_refptr<content::DevToolsAgentHost>);
-                                  const base::Value* arg1 = nullptr,
+  void Detach();
-                                  const base::Value* arg2 = nullptr,
+  void CallClientFunction(const std::string& function_name,
-                                  const base::Value* arg3 = nullptr) = 0;
+                          const base::Value* arg1,
-  virtual void InspectElement(int x, int y) = 0;
+                          const base::Value* arg2,
+                          const base::Value* arg3);
+  void InspectElement(int x, int y);
+
+  // Return the last position and size of devtools window.
+  gfx::Rect GetDevToolsBounds() const;
+  void SaveDevToolsBounds(const gfx::Rect& bounds);
+
+  // Return the last set zoom level of devtools window.
+  double GetDevToolsZoomLevel() const;
+  void UpdateDevToolsZoomLevel(double level);
+
+ private:
+  // DevToolsEmbedderMessageDispacher::Delegate
+  void ActivateWindow() override;
+  void CloseWindow() override;
+  void LoadCompleted() override;
+  void SetInspectedPageBounds(const gfx::Rect& rect) override;
+  void InspectElementCompleted() override;
+  void InspectedURLChanged(const std::string& url) override;
+  void LoadNetworkResource(const DispatchCallback& callback,
+                           const std::string& url,
+                           const std::string& headers,
+                           int stream_id) override;
+  void SetIsDocked(const DispatchCallback& callback, bool is_docked) override;
+  void OpenInNewTab(const std::string& url) override;
+  void ShowItemInFolder(const std::string& file_system_path) override;
+  void SaveToFile(const std::string& url,
+                  const std::string& content,
+                  bool save_as) override;
+  void AppendToFile(const std::string& url,
+                    const std::string& content) override;
+  void RequestFileSystems() override;
+  void AddFileSystem(const std::string& type) override;
+  void RemoveFileSystem(const std::string& file_system_path) override;
+  void UpgradeDraggedFileSystemPermissions(
+      const std::string& file_system_url) override;
+  void IndexPath(int index_request_id,
+                 const std::string& file_system_path,
+                 const std::string& excluded_folders) override;
+  void StopIndexing(int index_request_id) override;
+  void SearchInPath(int search_request_id,
+                    const std::string& file_system_path,
+                    const std::string& query) override;
+  void SetWhitelistedShortcuts(const std::string& message) override;
+  void SetEyeDropperActive(bool active) override;
+  void ShowCertificateViewer(const std::string& cert_chain) override;
+  void ZoomIn() override;
+  void ZoomOut() override;
+  void ResetZoom() override;
+  void SetDevicesDiscoveryConfig(
+      bool discover_usb_devices,
+      bool port_forwarding_enabled,
+      const std::string& port_forwarding_config,
+      bool network_discovery_enabled,
+      const std::string& network_discovery_config) override;
+  void SetDevicesUpdatesEnabled(bool enabled) override;
+  void PerformActionOnRemotePage(const std::string& page_id,
+                                 const std::string& action) override;
+  void OpenRemotePage(const std::string& browser_id,
+                      const std::string& url) override;
+  void OpenNodeFrontend() override;
+  void DispatchProtocolMessageFromDevToolsFrontend(
+      const std::string& message) override;
+  void SendJsonRequest(const DispatchCallback& callback,
+                       const std::string& browser_id,
+                       const std::string& url) override;
+  void GetPreferences(const DispatchCallback& callback) override;
+  void SetPreference(const std::string& name,
+                     const std::string& value) override;
+  void RemovePreference(const std::string& name) override;
+  void ClearPreferences() override;
+  void ConnectionReady() override;
+  void RegisterExtensionsAPI(const std::string& origin,
+                             const std::string& script) override;
+  void Reattach(const DispatchCallback& callback) override;
+  void RecordEnumeratedHistogram(const std::string& name,
+                                 int sample,
+                                 int boundary_value) override {}
+  void ReadyForTest() override {}
+  void SetOpenNewWindowForPopups(bool value) override {}
+  void RecordPerformanceHistogram(const std::string& name,
+                                  double duration) override {}
+  void RecordUserMetricsAction(const std::string& name) override {}
+
+  // content::DevToolsFrontendHostDelegate:
+  void HandleMessageFromDevToolsFrontend(const std::string& message);
+
+  // content::DevToolsAgentHostClient:
+  void DispatchProtocolMessage(content::DevToolsAgentHost* agent_host,
+                               base::span<const uint8_t> message) override;
+  void AgentHostClosed(content::DevToolsAgentHost* agent_host) override;
+
+  // content::WebContentsObserver:
+  void RenderFrameHostChanged(content::RenderFrameHost* old_host,
+                              content::RenderFrameHost* new_host) override;
+  void WebContentsDestroyed() override;
+  void OnWebContentsFocused(
+      content::RenderWidgetHost* render_widget_host) override;
+  void ReadyToCommitNavigation(
+      content::NavigationHandle* navigation_handle) override;
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override;
+
+  // content::WebContentsDelegate:
+  bool DidAddMessageToConsole(content::WebContents* source,
+                              blink::mojom::ConsoleMessageLevel level,
+                              const base::string16& message,
+                              int32_t line_no,
+                              const base::string16& source_id) override;
+  bool HandleKeyboardEvent(content::WebContents*,
+                           const content::NativeWebKeyboardEvent&) override;
+  void CloseContents(content::WebContents* source) override;
+  content::ColorChooser* OpenColorChooser(
+      content::WebContents* source,
+      SkColor color,
+      const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions)
+      override;
+  void RunFileChooser(content::RenderFrameHost* render_frame_host,
+                      scoped_refptr<content::FileSelectListener> listener,
+                      const blink::mojom::FileChooserParams& params) override;
+  void EnumerateDirectory(content::WebContents* source,
+                          scoped_refptr<content::FileSelectListener> listener,
+                          const base::FilePath& path) override;
+
+  void SendMessageAck(int request_id, const base::Value* arg1);
+
+#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
+  void AddDevToolsExtensionsToClient();
+#endif
+
+  bool frontend_loaded_;
+  scoped_refptr<content::DevToolsAgentHost> agent_host_;
+  std::unique_ptr<content::DevToolsFrontendHost> frontend_host_;
+  std::unique_ptr<DevToolsEmbedderMessageDispatcher>
+      embedder_message_dispatcher_;
+
+  DevToolsContentsResizingStrategy contents_resizing_strategy_;
+  gfx::Rect devtools_bounds_;
+  bool can_dock_;
+  std::string dock_state_;
+  bool activate_ = true;
+
+  InspectableWebContentsDelegate* delegate_;  // weak references.
+
+  PrefService* pref_service_;  // weak reference.
+
+  std::unique_ptr<content::WebContents> web_contents_;
+
+  // The default devtools created by this class when we don't have an external
+  // one assigned by SetDevToolsWebContents.
+  std::unique_ptr<content::WebContents> managed_devtools_web_contents_;
+  // The external devtools assigned by SetDevToolsWebContents.
+  content::WebContents* external_devtools_web_contents_ = nullptr;
+
+  bool is_guest_;
+  std::unique_ptr<InspectableWebContentsView> view_;
+
+  class NetworkResourceLoader;
+  std::set<std::unique_ptr<NetworkResourceLoader>, base::UniquePtrComparator>
+      loaders_;
+
+  using ExtensionsAPIs = std::map<std::string, std::string>;
+  ExtensionsAPIs extensions_api_;
+
+  base::WeakPtrFactory<InspectableWebContents> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(InspectableWebContents);
 };
 
 }  // namespace electron

shell/browser/ui/inspectable_web_contents_impl.h

@@ -1,243 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Copyright (c) 2013 Adam Roben <adam@roben.org>. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE-CHROMIUM file.
-
-#ifndef SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_IMPL_H_
-#define SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_IMPL_H_
-
-#include <list>
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-
-#include "base/containers/span.h"
-#include "base/containers/unique_ptr_adapters.h"
-#include "base/memory/weak_ptr.h"
-#include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
-#include "chrome/browser/devtools/devtools_embedder_message_dispatcher.h"
-#include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/devtools_frontend_host.h"
-#include "content/public/browser/web_contents_delegate.h"
-#include "content/public/browser/web_contents_observer.h"
-#include "electron/buildflags/buildflags.h"
-#include "shell/browser/ui/inspectable_web_contents.h"
-#include "ui/gfx/geometry/rect.h"
-
-class PrefService;
-class PrefRegistrySimple;
-
-namespace electron {
-
-class InspectableWebContentsDelegate;
-class InspectableWebContentsView;
-
-class InspectableWebContentsImpl
-    : public InspectableWebContents,
-      public content::DevToolsAgentHostClient,
-      public content::WebContentsObserver,
-      public content::WebContentsDelegate,
-      public DevToolsEmbedderMessageDispatcher::Delegate {
- public:
-  using List = std::list<InspectableWebContentsImpl*>;
-
-  static const List& GetAll();
-  static void RegisterPrefs(PrefRegistrySimple* pref_registry);
-
-  InspectableWebContentsImpl(content::WebContents* web_contents,
-                             PrefService* pref_service,
-                             bool is_guest);
-  ~InspectableWebContentsImpl() override;
-
-  InspectableWebContentsView* GetView() const override;
-  content::WebContents* GetWebContents() const override;
-  content::WebContents* GetDevToolsWebContents() const override;
-
-  void SetDelegate(InspectableWebContentsDelegate* delegate) override;
-  InspectableWebContentsDelegate* GetDelegate() const override;
-  bool IsGuest() const override;
-  void ReleaseWebContents() override;
-  void SetDevToolsWebContents(content::WebContents* devtools) override;
-  void SetDockState(const std::string& state) override;
-  void ShowDevTools(bool activate) override;
-  void CloseDevTools() override;
-  bool IsDevToolsViewShowing() override;
-  void AttachTo(scoped_refptr<content::DevToolsAgentHost>) override;
-  void Detach() override;
-  void CallClientFunction(const std::string& function_name,
-                          const base::Value* arg1,
-                          const base::Value* arg2,
-                          const base::Value* arg3) override;
-  void InspectElement(int x, int y) override;
-
-  // Return the last position and size of devtools window.
-  gfx::Rect GetDevToolsBounds() const;
-  void SaveDevToolsBounds(const gfx::Rect& bounds);
-
-  // Return the last set zoom level of devtools window.
-  double GetDevToolsZoomLevel() const;
-  void UpdateDevToolsZoomLevel(double level);
-
- private:
-  // DevToolsEmbedderMessageDispacher::Delegate
-  void ActivateWindow() override;
-  void CloseWindow() override;
-  void LoadCompleted() override;
-  void SetInspectedPageBounds(const gfx::Rect& rect) override;
-  void InspectElementCompleted() override;
-  void InspectedURLChanged(const std::string& url) override;
-  void LoadNetworkResource(const DispatchCallback& callback,
-                           const std::string& url,
-                           const std::string& headers,
-                           int stream_id) override;
-  void SetIsDocked(const DispatchCallback& callback, bool is_docked) override;
-  void OpenInNewTab(const std::string& url) override;
-  void ShowItemInFolder(const std::string& file_system_path) override;
-  void SaveToFile(const std::string& url,
-                  const std::string& content,
-                  bool save_as) override;
-  void AppendToFile(const std::string& url,
-                    const std::string& content) override;
-  void RequestFileSystems() override;
-  void AddFileSystem(const std::string& type) override;
-  void RemoveFileSystem(const std::string& file_system_path) override;
-  void UpgradeDraggedFileSystemPermissions(
-      const std::string& file_system_url) override;
-  void IndexPath(int index_request_id,
-                 const std::string& file_system_path,
-                 const std::string& excluded_folders) override;
-  void StopIndexing(int index_request_id) override;
-  void SearchInPath(int search_request_id,
-                    const std::string& file_system_path,
-                    const std::string& query) override;
-  void SetWhitelistedShortcuts(const std::string& message) override;
-  void SetEyeDropperActive(bool active) override;
-  void ShowCertificateViewer(const std::string& cert_chain) override;
-  void ZoomIn() override;
-  void ZoomOut() override;
-  void ResetZoom() override;
-  void SetDevicesDiscoveryConfig(
-      bool discover_usb_devices,
-      bool port_forwarding_enabled,
-      const std::string& port_forwarding_config,
-      bool network_discovery_enabled,
-      const std::string& network_discovery_config) override;
-  void SetDevicesUpdatesEnabled(bool enabled) override;
-  void PerformActionOnRemotePage(const std::string& page_id,
-                                 const std::string& action) override;
-  void OpenRemotePage(const std::string& browser_id,
-                      const std::string& url) override;
-  void OpenNodeFrontend() override;
-  void DispatchProtocolMessageFromDevToolsFrontend(
-      const std::string& message) override;
-  void SendJsonRequest(const DispatchCallback& callback,
-                       const std::string& browser_id,
-                       const std::string& url) override;
-  void GetPreferences(const DispatchCallback& callback) override;
-  void SetPreference(const std::string& name,
-                     const std::string& value) override;
-  void RemovePreference(const std::string& name) override;
-  void ClearPreferences() override;
-  void ConnectionReady() override;
-  void RegisterExtensionsAPI(const std::string& origin,
-                             const std::string& script) override;
-  void Reattach(const DispatchCallback& callback) override;
-  void RecordEnumeratedHistogram(const std::string& name,
-                                 int sample,
-                                 int boundary_value) override {}
-  void ReadyForTest() override {}
-  void SetOpenNewWindowForPopups(bool value) override {}
-  void RecordPerformanceHistogram(const std::string& name,
-                                  double duration) override {}
-  void RecordUserMetricsAction(const std::string& name) override {}
-
-  // content::DevToolsFrontendHostDelegate:
-  void HandleMessageFromDevToolsFrontend(const std::string& message);
-
-  // content::DevToolsAgentHostClient:
-  void DispatchProtocolMessage(content::DevToolsAgentHost* agent_host,
-                               base::span<const uint8_t> message) override;
-  void AgentHostClosed(content::DevToolsAgentHost* agent_host) override;
-
-  // content::WebContentsObserver:
-  void RenderFrameHostChanged(content::RenderFrameHost* old_host,
-                              content::RenderFrameHost* new_host) override;
-  void WebContentsDestroyed() override;
-  void OnWebContentsFocused(
-      content::RenderWidgetHost* render_widget_host) override;
-  void ReadyToCommitNavigation(
-      content::NavigationHandle* navigation_handle) override;
-  void DidFinishNavigation(
-      content::NavigationHandle* navigation_handle) override;
-
-  // content::WebContentsDelegate:
-  bool DidAddMessageToConsole(content::WebContents* source,
-                              blink::mojom::ConsoleMessageLevel level,
-                              const base::string16& message,
-                              int32_t line_no,
-                              const base::string16& source_id) override;
-  bool HandleKeyboardEvent(content::WebContents*,
-                           const content::NativeWebKeyboardEvent&) override;
-  void CloseContents(content::WebContents* source) override;
-  content::ColorChooser* OpenColorChooser(
-      content::WebContents* source,
-      SkColor color,
-      const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions)
-      override;
-  void RunFileChooser(content::RenderFrameHost* render_frame_host,
-                      scoped_refptr<content::FileSelectListener> listener,
-                      const blink::mojom::FileChooserParams& params) override;
-  void EnumerateDirectory(content::WebContents* source,
-                          scoped_refptr<content::FileSelectListener> listener,
-                          const base::FilePath& path) override;
-
-  void SendMessageAck(int request_id, const base::Value* arg1);
-
-#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
-  void AddDevToolsExtensionsToClient();
-#endif
-
-  bool frontend_loaded_;
-  scoped_refptr<content::DevToolsAgentHost> agent_host_;
-  std::unique_ptr<content::DevToolsFrontendHost> frontend_host_;
-  std::unique_ptr<DevToolsEmbedderMessageDispatcher>
-      embedder_message_dispatcher_;
-
-  DevToolsContentsResizingStrategy contents_resizing_strategy_;
-  gfx::Rect devtools_bounds_;
-  bool can_dock_;
-  std::string dock_state_;
-  bool activate_ = true;
-
-  InspectableWebContentsDelegate* delegate_;  // weak references.
-
-  PrefService* pref_service_;  // weak reference.
-
-  std::unique_ptr<content::WebContents> web_contents_;
-
-  // The default devtools created by this class when we don't have an external
-  // one assigned by SetDevToolsWebContents.
-  std::unique_ptr<content::WebContents> managed_devtools_web_contents_;
-  // The external devtools assigned by SetDevToolsWebContents.
-  content::WebContents* external_devtools_web_contents_ = nullptr;
-
-  bool is_guest_;
-  std::unique_ptr<InspectableWebContentsView> view_;
-
-  class NetworkResourceLoader;
-  std::set<std::unique_ptr<NetworkResourceLoader>, base::UniquePtrComparator>
-      loaders_;
-
-  using ExtensionsAPIs = std::map<std::string, std::string>;
-  ExtensionsAPIs extensions_api_;
-
-  base::WeakPtrFactory<InspectableWebContentsImpl> weak_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsImpl);
-};
-
-}  // namespace electron
-
-#endif  // SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_IMPL_H_

shell/browser/ui/inspectable_web_contents_view_mac.h

@@ -14,12 +14,12 @@
 
 namespace electron {
 
-class InspectableWebContentsImpl;
+class InspectableWebContents;
 
 class InspectableWebContentsViewMac : public InspectableWebContentsView {
  public:
   explicit InspectableWebContentsViewMac(
-      InspectableWebContentsImpl* inspectable_web_contents_impl);
+      InspectableWebContents* inspectable_web_contents);
   InspectableWebContentsViewMac(const InspectableWebContentsViewMac&) = delete;
   InspectableWebContentsViewMac& operator=(
       const InspectableWebContentsViewMac&) = delete;
@@ -35,13 +35,13 @@ class InspectableWebContentsViewMac : public InspectableWebContentsView {
       const DevToolsContentsResizingStrategy& strategy) override;
   void SetTitle(const base::string16& title) override;
 
-  InspectableWebContentsImpl* inspectable_web_contents() {
+  InspectableWebContents* inspectable_web_contents() {
     return inspectable_web_contents_;
   }
 
  private:
   // Owns us.
-  InspectableWebContentsImpl* inspectable_web_contents_;
+  InspectableWebContents* inspectable_web_contents_;
 
   base::scoped_nsobject<ElectronInspectableWebContentsView> view_;
 };

shell/browser/ui/inspectable_web_contents_view_mac.mm

@@ -15,12 +15,12 @@
 namespace electron {
 
 InspectableWebContentsView* CreateInspectableContentsView(
-    InspectableWebContentsImpl* inspectable_web_contents) {
+    InspectableWebContents* inspectable_web_contents) {
   return new InspectableWebContentsViewMac(inspectable_web_contents);
 }
 
 InspectableWebContentsViewMac::InspectableWebContentsViewMac(
-    InspectableWebContentsImpl* inspectable_web_contents)
+    InspectableWebContents* inspectable_web_contents)
     : inspectable_web_contents_(inspectable_web_contents),
       view_([[ElectronInspectableWebContentsView alloc]
           initWithInspectableWebContentsViewMac:this]) {}

shell/browser/ui/views/inspectable_web_contents_view_views.cc

@@ -9,8 +9,8 @@
 #include <utility>
 
 #include "base/strings/utf_string_conversions.h"
+#include "shell/browser/ui/inspectable_web_contents.h"
 #include "shell/browser/ui/inspectable_web_contents_delegate.h"
-#include "shell/browser/ui/inspectable_web_contents_impl.h"
 #include "shell/browser/ui/inspectable_web_contents_view_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/webview/webview.h"
@@ -74,12 +74,12 @@ class DevToolsWindowDelegate : public views::ClientView,
 }  // namespace
 
 InspectableWebContentsView* CreateInspectableContentsView(
-    InspectableWebContentsImpl* inspectable_web_contents) {
+    InspectableWebContents* inspectable_web_contents) {
   return new InspectableWebContentsViewViews(inspectable_web_contents);
 }
 
 InspectableWebContentsViewViews::InspectableWebContentsViewViews(
-    InspectableWebContentsImpl* inspectable_web_contents)
+    InspectableWebContents* inspectable_web_contents)
     : inspectable_web_contents_(inspectable_web_contents),
       devtools_window_web_view_(nullptr),
       contents_web_view_(nullptr),

shell/browser/ui/views/inspectable_web_contents_view_views.h

@@ -20,13 +20,13 @@ class WidgetDelegate;
 
 namespace electron {
 
-class InspectableWebContentsImpl;
+class InspectableWebContents;
 
 class InspectableWebContentsViewViews : public InspectableWebContentsView,
                                         public views::View {
  public:
   explicit InspectableWebContentsViewViews(
-      InspectableWebContentsImpl* inspectable_web_contents_impl);
+      InspectableWebContents* inspectable_web_contents);
   ~InspectableWebContentsViewViews() override;
 
   // InspectableWebContentsView:
@@ -41,7 +41,7 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView,
       const DevToolsContentsResizingStrategy& strategy) override;
   void SetTitle(const base::string16& title) override;
 
-  InspectableWebContentsImpl* inspectable_web_contents() {
+  InspectableWebContents* inspectable_web_contents() {
     return inspectable_web_contents_;
   }
 
@@ -52,7 +52,7 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView,
   void Layout() override;
 
   // Owns us.
-  InspectableWebContentsImpl* inspectable_web_contents_;
+  InspectableWebContents* inspectable_web_contents_;
 
   std::unique_ptr<views::Widget> devtools_window_;
   views::WebView* devtools_window_web_view_;