DevTools: merge devtools target with devtools host, part 1

chrome/browser/ui/webui/inspect_ui.cc

 // 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.
 
 #include "chrome/browser/ui/webui/inspect_ui.h"
 
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/browser/devtools/devtools_targets_ui.h"
@@ skipping 13 matching lines @@
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "grit/browser_resources.h"
 
+using content::DevToolsAgentHost;
 using content::WebContents;
 using content::WebUIMessageHandler;
 
 namespace {
 
 const char kInitUICommand[]  = "init-ui";
 const char kInspectCommand[]  = "inspect";
 const char kActivateCommand[]  = "activate";
 const char kCloseCommand[]  = "close";
 const char kReloadCommand[]  = "reload";
@@ skipping 225 matching lines @@
 void InspectUI::InitUI() {
   SetPortForwardingDefaults();
   StartListeningNotifications();
   UpdateDiscoverUsbDevicesEnabled();
   UpdatePortForwardingEnabled();
   UpdatePortForwardingConfig();
 }
 
 void InspectUI::Inspect(const std::string& source_id,
                         const std::string& target_id) {
-  DevToolsTargetImpl* target = FindTarget(source_id, target_id);
+  scoped_refptr<DevToolsAgentHost> target = FindTarget(source_id, target_id);
   if (target) {
     const std::string target_type = target->GetType();
-    target->Inspect(Profile::FromWebUI(web_ui()));
+    target->Inspect();
     ForceUpdateIfNeeded(source_id, target_type);
   }
 }
 
 void InspectUI::Activate(const std::string& source_id,
                          const std::string& target_id) {
-  DevToolsTargetImpl* target = FindTarget(source_id, target_id);
+  scoped_refptr<DevToolsAgentHost> target = FindTarget(source_id, target_id);
   if (target) {
     const std::string target_type = target->GetType();
     target->Activate();
     ForceUpdateIfNeeded(source_id, target_type);
   }
 }
 
 void InspectUI::Close(const std::string& source_id,
                       const std::string& target_id) {
-  DevToolsTargetImpl* target = FindTarget(source_id, target_id);
+  scoped_refptr<DevToolsAgentHost> target = FindTarget(source_id, target_id);
   if (target) {
     const std::string target_type = target->GetType();
     target->Close();
     ForceUpdateIfNeeded(source_id, target_type);
   }
 }
 
 void InspectUI::Reload(const std::string& source_id,
                        const std::string& target_id) {
-  DevToolsTargetImpl* target = FindTarget(source_id, target_id);
+  scoped_refptr<DevToolsAgentHost> target = FindTarget(source_id, target_id);
   if (target) {
     const std::string target_type = target->GetType();
     target->Reload();
     ForceUpdateIfNeeded(source_id, target_type);
   }
 }
 
 void InspectUI::Open(const std::string& source_id,
                      const std::string& browser_id,
                      const std::string& url) {
@@ skipping 171 matching lines @@
 
 void InspectUI::AddTargetUIHandler(
     std::unique_ptr<DevToolsTargetsUIHandler> handler) {
   DevToolsTargetsUIHandler* handler_ptr = handler.release();
   target_handlers_[handler_ptr->source_id()] = handler_ptr;
 }
 
 DevToolsTargetsUIHandler* InspectUI::FindTargetHandler(
     const std::string& source_id) {
   TargetHandlerMap::iterator it = target_handlers_.find(source_id);
-     return it != target_handlers_.end() ? it->second : NULL;
+     return it != target_handlers_.end() ? it->second : nullptr;
 }
 
-DevToolsTargetImpl* InspectUI::FindTarget(
+scoped_refptr<content::DevToolsAgentHost> InspectUI::FindTarget(
     const std::string& source_id, const std::string& target_id) {
   TargetHandlerMap::iterator it = target_handlers_.find(source_id);
-  return it != target_handlers_.end() ?
-         it->second->GetTarget(target_id) : NULL;
+  DevToolsTargetImpl* target = it != target_handlers_.end() ?
+      it->second->GetTarget(target_id) : nullptr;
+  return target ? target->GetAgentHost() : nullptr;
 }
 
 void InspectUI::PopulateTargets(const std::string& source,
                                 const base::ListValue& targets) {
   web_ui()->CallJavascriptFunctionUnsafe("populateTargets",
                                          base::StringValue(source), targets);
 }
 
 void InspectUI::ForceUpdateIfNeeded(const std::string& source_id,
                                     const std::string& target_type) {
   // TODO(dgozman): remove this after moving discovery to protocol.
   // See crbug.com/398049.
-  if (target_type != DevToolsTargetImpl::kTargetTypeServiceWorker)
+  if (target_type != content::DevToolsAgentHost::kTypeServiceWorker)
     return;
   DevToolsTargetsUIHandler* handler = FindTargetHandler(source_id);
   if (handler)
     handler->ForceUpdate();
 }
 
 void InspectUI::PopulatePortStatus(const base::Value& status) {
   web_ui()->CallJavascriptFunctionUnsafe("populatePortStatus", status);
 }
 
 void InspectUI::ShowIncognitoWarning() {
   web_ui()->CallJavascriptFunctionUnsafe("showIncognitoWarning");
 }