[DevTools] Add toolbox web contents to show in undocked mode.

chrome/browser/devtools/devtools_window.h

 // Copyright (c) 2012 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 CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
 
 #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
 #include "chrome/browser/devtools/devtools_toggle_action.h"
 #include "chrome/browser/devtools/devtools_ui_bindings.h"
@@ skipping 27 matching lines @@
   // Return the DevToolsWindow for the given RenderViewHost if one exists,
   // otherwise NULL.
   static DevToolsWindow* GetInstanceForInspectedRenderViewHost(
       content::RenderViewHost* inspected_rvh);
 
   // Return the DevToolsWindow for the given WebContents if one exists,
   // otherwise NULL.
   static DevToolsWindow* GetInstanceForInspectedWebContents(
       content::WebContents* inspected_web_contents);
 
-  // Return the DevToolsWindow for the given WebContents if one exists and is
-  // docked, otherwise NULL. This method will return only fully initialized
-  // window ready to be presented in UI.
+  // Return the docked DevTools WebContents for the given inspected WebContents
+  // if one exists and should be shown in browser window, otherwise NULL.
+  // This method will return only fully initialized window ready to be
+  // presented in UI.
+  // If |out_strategy| is not NULL, it will contain resizing strategy.
   // For immediately-ready-to-use but maybe not yet fully initialized DevTools
   // use |GetInstanceForInspectedRenderViewHost| instead.
-  static DevToolsWindow* GetDockedInstanceForInspectedTab(
-      content::WebContents* inspected_tab);
+  static content::WebContents* GetInTabWebContents(
+      content::WebContents* inspected_tab,
+      DevToolsContentsResizingStrategy* out_strategy);
 
   static bool IsDevToolsWindow(content::RenderViewHost* window_rvh);
 
   // Open or reveal DevTools window, and perform the specified action.
   static DevToolsWindow* OpenDevToolsWindow(
       content::RenderViewHost* inspected_rvh,
       const DevToolsToggleAction& action);
 
   // Open or reveal DevTools window, with no special action.
   static DevToolsWindow* OpenDevToolsWindow(
@@ skipping 17 matching lines @@
       content::DevToolsAgentHost* agent_host);
 
   // Worker frontend is always undocked.
   static DevToolsWindow* OpenDevToolsWindowForWorker(
       Profile* profile,
       content::DevToolsAgentHost* worker_agent);
 
   static void InspectElement(
       content::RenderViewHost* inspected_rvh, int x, int y);
 
-  content::WebContents* web_contents() { return web_contents_; }
-
-  Browser* browser() { return browser_; }  // For tests.
-
-  // Inspected WebContents is placed over DevTools WebContents in docked mode.
-  // The following method returns the resizing strategy of inspected
-  // WebContents relative to DevTools WebContents.
-  const DevToolsContentsResizingStrategy& GetContentsResizingStrategy() const;
-
-  // Minimum size of the docked DevTools WebContents. This includes
-  // the overlaying inspected WebContents size.
-  gfx::Size GetMinimumSize() const;
+  Browser* browser_for_test() { return browser_; }
+  content::WebContents* web_contents_for_test() { return main_web_contents_; }
 
   // Sets closure to be called after load is done. If already loaded, calls
   // closure immediately.
   void SetLoadCompletedCallback(const base::Closure& closure);
 
   // Forwards an unhandled keyboard event to the DevTools frontend.
   bool ForwardKeyboardEvent(const content::NativeWebKeyboardEvent& event);
 
   // BeforeUnload interception ////////////////////////////////////////////////
 
@@ skipping 120 matching lines @@
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
       const content::OpenURLParams& params) OVERRIDE;
   virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
   virtual void AddNewContents(content::WebContents* source,
                               content::WebContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_pos,
                               bool user_gesture,
                               bool* was_blocked) OVERRIDE;
+  virtual void WebContentsCreated(content::WebContents* source_contents,
+                                  int opener_render_frame_id,
+                                  const base::string16& frame_name,
+                                  const GURL& target_url,
+                                  content::WebContents* new_contents) OVERRIDE;
   virtual void CloseContents(content::WebContents* source) OVERRIDE;
   virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;
   virtual void BeforeUnloadFired(content::WebContents* tab,
                                  bool proceed,
                                  bool* proceed_to_fire_unload) OVERRIDE;
   virtual bool PreHandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event,
       bool* is_keyboard_shortcut) OVERRIDE;
   virtual void HandleKeyboardEvent(
@@ skipping 30 matching lines @@
   virtual void RenderProcessGone() OVERRIDE;
 
   void CreateDevToolsBrowser();
   BrowserWindow* GetInspectedBrowserWindow();
   void ScheduleShow(const DevToolsToggleAction& action);
   void Show(const DevToolsToggleAction& action);
   void DoAction(const DevToolsToggleAction& action);
   void LoadCompleted();
   void SetIsDockedAndShowImmediatelyForTest(bool is_docked);
   void UpdateBrowserToolbar();
+  void UpdateBrowserWindow();
   content::WebContents* GetInspectedWebContents();
 
   class InspectedWebContentsObserver;
   scoped_ptr<InspectedWebContentsObserver> inspected_contents_observer_;
 
   Profile* profile_;
-  content::WebContents* web_contents_;
+  content::WebContents* main_web_contents_;
+  content::WebContents* toolbox_web_contents_;
   DevToolsUIBindings* bindings_;
   Browser* browser_;
   bool is_docked_;
   const bool can_dock_;
   LoadState load_state_;
   DevToolsToggleAction action_on_load_;
   bool ignore_set_is_docked_;
   DevToolsContentsResizingStrategy contents_resizing_strategy_;
   // True if we're in the process of handling a beforeunload event originating
   // from the inspected webcontents, see InterceptPageBeforeUnload for details.
   bool intercepted_page_beforeunload_;
   base::Closure load_completed_callback_;
 
   base::TimeTicks inspect_element_start_time_;
   scoped_ptr<DevToolsEventForwarder> event_forwarder_;
 
   friend class DevToolsEventForwarder;
   DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_