[Extensions] Combine developerPrivate.inspect and developerPrivate.openDevTools

chrome/common/extensions/api/developer_private.idl

 // 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.
 
 // developerPrivate API.
 // This is a private API exposing developing and debugging functionalities for
 // apps and extensions.
 namespace developerPrivate {
 
   // DEPRECATED: Prefer ExtensionType.
@@ skipping 11 matching lines @@
     DOMString path;
 
     // For lazy background pages, the value is -1.
     long render_process_id;
 
     long render_view_id;
     boolean incognito;
     boolean generatedBackgroundPage;
   };
 
+  // DEPRECATED: Use OpenDevTools.
+  dictionary InspectOptions {
+    DOMString extension_id;
+    (DOMString or long) render_process_id;
+    (DOMString or long) render_view_id;
+    boolean incognito;
+  };
+
   dictionary InstallWarning {
     DOMString message;
   };
 
   enum ExtensionType {
     HOSTED_APP,
     PLATFORM_APP,
     LEGACY_PACKAGED_APP,
     EXTENSION,
     THEME,
@@ skipping 169 matching lines @@
 
     // All views of the current extension.
     ItemInspectView[] views;
   };
 
   dictionary GetExtensionsInfoOptions {
     boolean? includeDisabled;
     boolean? includeTerminated;
   };
 
-  // TODO(devlin): Combine inspect and openDevTools?
-  dictionary InspectOptions {
-    DOMString extension_id;
-    (DOMString or long) render_process_id;
-    (DOMString or long) render_view_id;
-    boolean incognito;
-  };
-
   dictionary ExtensionConfigurationUpdate {
     DOMString extensionId;
     boolean? fileAccess;
     boolean? incognitoAccess;
     boolean? errorCollection;
     boolean? runOnAllUrls;
     boolean? showActionButton;
   };
 
   dictionary ReloadOptions {
@@ skipping 95 matching lines @@
     DOMString afterHighlight;
 
     // A title for the file in the form '<extension name>: <file name>'.
     DOMString title;
 
     // The error message.
     DOMString message;
   };
 
   dictionary OpenDevToolsProperties {
+    // The ID of the extension. This is only needed if opening the background
+    // page (where renderViewId and renderProcessId are -1).
+    DOMString? extensionId;
+
     // The ID of the render view in which the error occurred.
     long renderViewId;
 
     // The ID of the process in which the error occurred.
     long renderProcessId;
 
+    boolean? incognito;
+
     // The URL in which the error occurred.
     DOMString? url;
 
     // The line to focus the devtools at.
     long? lineNumber;
 
     // The column to focus the devtools at.
     long? columnNumber;
   };
 
@@ skipping 34 matching lines @@
     // DEPRECATED: Prefer getExtensionsInfo.
     static void getItemsInfo(boolean includeDisabled,
                              boolean includeTerminated,
                              ItemsInfoCallback callback);
 
     // Opens a permissions dialog.
     // |extensionId| : The id of the extension to show permissions for.
     static void showPermissionsDialog(DOMString extensionId,
                                       optional VoidCallback callback);
 
-    // Opens a developer tools inspection window.
-    // |options| : The details about the inspection.
-    static void inspect(InspectOptions options,
-                        optional VoidCallback callback);
-
     // Reloads a given extension.
     // |extensionId| : The id of the extension to reload.
     // |options| : Additional configuration parameters.
     static void reload(DOMString extensionId,
                        optional ReloadOptions options,
                        optional VoidCallback callback);
 
     // Modifies an extension's current configuration.
     // |update| : The parameters for updating the extension's configuration.
     //     Any properties omitted from |update| will not be changed.
@@ skipping 33 matching lines @@
 
     // Returns true if the profile is managed.
     static void isProfileManaged(BooleanCallback callback);
 
     // Reads and returns the contents of a file related to an extension which
     // caused an error.
     static void requestFileSource(RequestFileSourceProperties properties,
                                   RequestFileSourceCallback callback);
 
     // Open the developer tools to focus on a particular error.
-    static void openDevTools(OpenDevToolsProperties properties);
+    static void openDevTools(OpenDevToolsProperties properties,
+                             optional VoidCallback callback);
+
+    // Deprecated api methods, retained for compatability.
+    [nocompile] static void allowIncognito(DOMString extensionId,
+                                           boolean allow,
+                                           optional VoidCallback callback);
+    [nocompile] static void allowFileAccess(DOMString extensionId,
+                                            boolean allow,
+                                            optional VoidCallback callback);
+    [nocompile] static void inspect(InspectOptions options,
+                                    optional VoidCallback callback);
   };
 
   interface Events {
     // Fired when a item state is changed.
     static void onItemStateChanged(EventData response);
   };
 
 };