DevTools: devtools manager should know nothing about DevToolsWindow

content/browser/debugger/devtools_manager.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_DEBUGGER_DEVTOOLS_MANAGER_H_
 #define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_MANAGER_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 35 matching lines @@
   // Returns DevToolsClientHost registered for |inspected_rvh| or NULL if
   // there is no alive DevToolsClientHost registered for |inspected_rvh|.
   DevToolsClientHost* GetDevToolsClientHostFor(RenderViewHost* inspected_rvh);
 
   // Registers new DevToolsClientHost for |inspected_rvh|. There must be no
   // other DevToolsClientHosts registered for the RenderViewHost at the moment.
   void RegisterDevToolsClientHostFor(RenderViewHost* inspected_rvh,
                                      DevToolsClientHost* client_host);
   void UnregisterDevToolsClientHostFor(RenderViewHost* inspected_rvh);
 
-  void ForwardToDevToolsAgent(RenderViewHost* client_rvh,
-                              const IPC::Message& message);
   void ForwardToDevToolsAgent(DevToolsClientHost* from,
                               const IPC::Message& message);
   void ForwardToDevToolsClient(RenderViewHost* inspected_rvh,
                                const IPC::Message& message);
 
-  void ActivateWindow(RenderViewHost* client_rvn);
-  void CloseWindow(RenderViewHost* client_rvn);
-  void RequestDockWindow(RenderViewHost* client_rvn);
-  void RequestUndockWindow(RenderViewHost* client_rvn);
+  void CloseClient(DevToolsClientHost* client_host);

[pfeldman, 2011/07/07 12:17:52]

How does this correlate with NotifyCloseListener?

[yurys, 2011/07/07 12:30:39]

Removed this method.

 
-  void OpenDevToolsWindow(RenderViewHost* inspected_rvh);
-  void ToggleDevToolsWindow(RenderViewHost* inspected_rvh,
-                            DevToolsToggleAction action);
   void RuntimePropertyChanged(RenderViewHost* inspected_rvh,
                               const std::string& name,
                               const std::string& value);
 
-  // Starts element inspection in the devtools client.
-  // Creates one by means of OpenDevToolsWindow if no client
-  // exists.
-  void InspectElement(RenderViewHost* inspected_rvh, int x, int y);
+  // Starts element inspection in the devtools agent.
+  void SendInspectElement(RenderViewHost* inspected_rvh, int x, int y);
 
   // Sends 'Attach' message to the agent using |dest_rvh| in case
   // there is a DevToolsClientHost registered for the |inspected_rvh|.
   void OnNavigatingToPendingEntry(RenderViewHost* inspected_rvh,
                                   RenderViewHost* dest_rvh,
                                   const GURL& gurl);
 
   // Invoked when a tab is replaced by another tab. This is triggered by
   // TabStripModel::ReplaceTabContentsAt.
   void TabReplaced(TabContentsWrapper* old_tab, TabContentsWrapper* new_tab);
@@ skipping 25 matching lines @@
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Returns RenderViewHost for the tab that is inspected by devtools
   // client hosted by DevToolsClientHost.
   RenderViewHost* GetInspectedRenderViewHost(DevToolsClientHost* client_host);
 
   void SendAttachToAgent(RenderViewHost* inspected_rvh);
   void SendDetachToAgent(RenderViewHost* inspected_rvh);
 
-  void ForceReopenWindow();
-
-  DevToolsClientHost* FindOwnerDevToolsClientHost(RenderViewHost* client_rvh);
-
-  void ToggleDevToolsWindow(RenderViewHost* inspected_rvh,
-                            bool force_open,
-                            DevToolsToggleAction action);
-
-  void ReopenWindow(RenderViewHost* client_rvh, bool docked);
-
   void BindClientHost(RenderViewHost* inspected_rvh,
                       DevToolsClientHost* client_host,
                       const DevToolsRuntimeProperties& runtime_properties);
 
   void UnbindClientHost(RenderViewHost* inspected_rvh,
                         DevToolsClientHost* client_host);
 
   // These two maps are for tracking dependencies between inspected tabs and
   // their DevToolsClientHosts. They are useful for routing devtools messages
   // and allow us to have at most one devtools client host per tab.
   //
   // DevToolsManager start listening to DevToolsClientHosts when they are put
   // into these maps and removes them when they are closing.
   typedef std::map<RenderViewHost*, DevToolsClientHost*>
       InspectedRvhToClientHostMap;
   InspectedRvhToClientHostMap inspected_rvh_to_client_host_;
 
   typedef std::map<DevToolsClientHost*, RenderViewHost*>
       ClientHostToInspectedRvhMap;
   ClientHostToInspectedRvhMap client_host_to_inspected_rvh_;
 
   typedef std::map<RenderViewHost*, DevToolsRuntimeProperties>
       RuntimePropertiesMap;
   RuntimePropertiesMap runtime_properties_map_;
 
-  RenderViewHost* inspected_rvh_for_reopen_;
-  bool in_initial_show_;
-
   typedef std::map<int,
                    std::pair<DevToolsClientHost*, DevToolsRuntimeProperties> >
       OrphanClientHosts;
   OrphanClientHosts orphan_client_hosts_;
   int last_orphan_cookie_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsManager);
 };
 
 #endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_MANAGER_H_