[Extensions] Combine developerPrivate.inspect and developerPrivate.openDevTools

chrome/browser/extensions/api/developer_private/developer_private_api.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/extensions/api/developer_private/developer_private_api.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
@@ skipping 176 matching lines @@
     return false;
   }
 
   return true;
 }
 
 }  // namespace
 
 namespace ChoosePath = api::developer_private::ChoosePath;
 namespace GetItemsInfo = api::developer_private::GetItemsInfo;
-namespace Inspect = api::developer_private::Inspect;
 namespace PackDirectory = api::developer_private::PackDirectory;
 namespace Reload = api::developer_private::Reload;
 
 static base::LazyInstance<BrowserContextKeyedAPIFactory<DeveloperPrivateAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<DeveloperPrivateAPI>*
 DeveloperPrivateAPI::GetFactoryInstance() {
   return g_factory.Pointer();
@@ skipping 397 matching lines @@
       target_extension,
       source_context_type() == Feature::WEBUI_CONTEXT,
       base::Bind(&DeveloperPrivateShowPermissionsDialogFunction::Finish, this));
   return RespondLater();
 }
 
 void DeveloperPrivateShowPermissionsDialogFunction::Finish() {
   Respond(NoArguments());
 }
 
-ExtensionFunction::ResponseAction DeveloperPrivateInspectFunction::Run() {
-  scoped_ptr<developer::Inspect::Params> params(
-      developer::Inspect::Params::Create(*args_));
-  EXTENSION_FUNCTION_VALIDATE(params);
-  const developer::InspectOptions& options = params->options;
-
-  int render_process_id = 0;
-  if (options.render_process_id.as_string &&
-      !base::StringToInt(*options.render_process_id.as_string,
-                         &render_process_id)) {
-    return RespondNow(Error(kNoSuchRendererError));
-  } else if (options.render_process_id.as_integer) {
-    render_process_id = *options.render_process_id.as_integer;
-  }
-
-  int render_view_id = 0;
-  if (options.render_view_id.as_string &&
-      !base::StringToInt(*options.render_view_id.as_string, &render_view_id)) {
-    return RespondNow(Error(kNoSuchRendererError));
-  } else if (options.render_view_id.as_integer) {
-    render_view_id = *options.render_view_id.as_integer;
-  }
-
-  if (render_process_id == -1) {
-    // This is a lazy background page.
-    const Extension* extension = ExtensionRegistry::Get(
-        browser_context())->enabled_extensions().GetByID(options.extension_id);
-    if (!extension)
-      return RespondNow(Error(kNoSuchExtensionError));
-
-    Profile* profile = Profile::FromBrowserContext(browser_context());
-    if (options.incognito)
-      profile = profile->GetOffTheRecordProfile();
-
-    // Wakes up the background page and opens the inspect window.
-    devtools_util::InspectBackgroundPage(extension, profile);
-    return RespondNow(NoArguments());
-  }
-
-  content::RenderViewHost* host = content::RenderViewHost::FromID(
-      render_process_id, render_view_id);
-
-  if (!host || !content::WebContents::FromRenderViewHost(host))
-    return RespondNow(Error(kNoSuchRendererError));
-
-  DevToolsWindow::OpenDevToolsWindow(
-      content::WebContents::FromRenderViewHost(host));
-  return RespondNow(NoArguments());
-}
-
-DeveloperPrivateInspectFunction::~DeveloperPrivateInspectFunction() {}
-
 DeveloperPrivateLoadUnpackedFunction::DeveloperPrivateLoadUnpackedFunction()
     : fail_quietly_(false) {
 }
 
 ExtensionFunction::ResponseAction DeveloperPrivateLoadUnpackedFunction::Run() {
   scoped_ptr<developer_private::LoadUnpacked::Params> params(
       developer_private::LoadUnpacked::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   if (!ShowPicker(
@@ skipping 518 matching lines @@
 DeveloperPrivateOpenDevToolsFunction::DeveloperPrivateOpenDevToolsFunction() {}
 DeveloperPrivateOpenDevToolsFunction::~DeveloperPrivateOpenDevToolsFunction() {}
 
 ExtensionFunction::ResponseAction
 DeveloperPrivateOpenDevToolsFunction::Run() {
   scoped_ptr<developer::OpenDevTools::Params> params(
       developer::OpenDevTools::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
   const developer::OpenDevToolsProperties& properties = params->properties;
 
+  if (properties.render_process_id == -1) {
+    // This is a lazy background page.
+    const Extension* extension = properties.extension_id ?
+        ExtensionRegistry::Get(browser_context())->enabled_extensions().GetByID(
+            *properties.extension_id) : nullptr;
+    if (!extension)
+      return RespondNow(Error(kNoSuchExtensionError));
+
+    Profile* profile = Profile::FromBrowserContext(browser_context());
+    if (properties.incognito && *properties.incognito)
+      profile = profile->GetOffTheRecordProfile();
+
+    // Wakes up the background page and opens the inspect window.
+    devtools_util::InspectBackgroundPage(extension, profile);
+    return RespondNow(NoArguments());
+  }
+
   content::RenderViewHost* rvh =
       content::RenderViewHost::FromID(properties.render_process_id,
                                       properties.render_view_id);
+
   content::WebContents* web_contents =
       rvh ? content::WebContents::FromRenderViewHost(rvh) : nullptr;
   // It's possible that the render view was closed since we last updated the
   // links. Handle this gracefully.
   if (!web_contents)
     return RespondNow(Error(kNoSuchRendererError));
 
   // If we include a url, we should inspect it specifically (and not just the
   // render view).
   if (properties.url) {
@@ skipping 21 matching lines @@
 
   TabStripModel* tab_strip = browser->tab_strip_model();
   tab_strip->ActivateTabAt(tab_strip->GetIndexOfWebContents(web_contents),
                            false);  // Not through direct user gesture.
   return RespondNow(NoArguments());
 }
 
 }  // namespace api
 
 }  // namespace extensions