~justinmcp/unity-chromium-extension/native-messaging-base

Index: src/chrome/browser/infobars/infobar_extension_api.h

===================================================================

--- src/chrome/browser/infobars/infobar_extension_api.h (revision 205727)

+++ src/chrome/browser/infobars/infobar_extension_api.h (working copy)

@@ -10,7 +10,7 @@

 class InfobarsShowFunction : public SyncExtensionFunction {

   virtual ~InfobarsShowFunction() {}

   virtual bool RunImpl() OVERRIDE;

-  DECLARE_EXTENSION_FUNCTION("experimental.infobars.show",

+  DECLARE_EXTENSION_FUNCTION("infobars.show",

                              EXPERIMENTAL_INFOBARS_SHOW)

 };

 

Index: src/chrome/common/extensions/api/api.gyp

===================================================================

--- src/chrome/common/extensions/api/api.gyp    (revision 205727)

+++ src/chrome/common/extensions/api/api.gyp    (working copy)

@@ -48,7 +48,6 @@

           'experimental_history.json',

           'experimental_identity.idl',

           'experimental_idltest.idl',

-          'experimental_infobars.json',

           'location.idl',

           'experimental_media_galleries.idl',

           'experimental_record.json',

@@ -63,6 +62,7 @@

           'i18n.json',

           'identity.idl',

           'idle.json',

+          'infobars.json',

           'managed_mode_private.json',

           'management.json',

           'manifest_types.json',

Index: src/chrome/common/extensions/api/experimental_infobars.json

===================================================================

--- src/chrome/common/extensions/api/experimental_infobars.json (revision 205727)

+++ src/chrome/common/extensions/api/experimental_infobars.json (working copy)

@@ -1,53 +0,0 @@

-// 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.

-

-[

-  {

-    "namespace": "experimental.infobars",

-    "compiler_options": {

-      "implemented_in": "chrome/browser/infobars/infobar_extension_api.h"

-    },

-    "types": [],

-    "functions": [

-      {

-        "name": "show",

-        "type": "function",

-        "description": "Shows an infobar in the specified tab. The infobar will be closed automatically when the tab navigates. Use window.close() to close the infobar before then.",

-        "parameters": [

-          {

-            "name": "details",

-            "type": "object",

-            "properties": {

-              "tabId": {

-                "type": "integer",

-                "description": "The tab id for the tab to display the infobar in."

-              },

-              "path": {

-                "type": "string",

-                "description": "The html file that contains the infobar."

-              },

-              "height": {

-                "type": "integer",

-                "description": "The height (in pixels) of the infobar to show. If omitted, the default infobar height will be used.",

-                "optional": true,

-                "minimum": 0,

-                "maximum": 72

-              }

-            }

-          },

-          {

-            "type": "function",

-            "name": "callback",

-            "optional": true,

-            "parameters": [

-              {

-                "name": "window", "$ref": "windows.Window", "description": "Contains details about the window in which the infobar was created."

-              }

-            ]

-          }

-        ]

-      }

-    ]

-  }

-]

Index: src/chrome/common/extensions/api/infobars.json

===================================================================

--- src/chrome/common/extensions/api/infobars.json      (revision 0)

+++ src/chrome/common/extensions/api/infobars.json      (working copy)

@@ -0,0 +1,53 @@

+// 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.

+

+[

+  {

+    "namespace": "infobars",

+    "compiler_options": {

+      "implemented_in": "chrome/browser/infobars/infobar_extension_api.h"

+    },

+    "types": [],

+    "functions": [

+      {

+        "name": "show",

+        "type": "function",

+        "description": "Shows an infobar in the specified tab. The infobar will be closed automatically when the tab navigates. Use window.close() to close the infobar before then.",

+        "parameters": [

+          {

+            "name": "details",

+            "type": "object",

+            "properties": {

+              "tabId": {

+                "type": "integer",

+                "description": "The tab id for the tab to display the infobar in."

+              },

+              "path": {

+                "type": "string",

+                "description": "The html file that contains the infobar."

+              },

+              "height": {

+                "type": "integer",

+                "description": "The height (in pixels) of the infobar to show. If omitted, the default infobar height will be used.",

+                "optional": true,

+                "minimum": 0,

+                "maximum": 72

+              }

+            }

+          },

+          {

+            "type": "function",

+            "name": "callback",

+            "optional": true,

+            "parameters": [

+              {

+                "name": "window", "$ref": "windows.Window", "description": "Contains details about the window in which the infobar was created."

+              }

+            ]

+          }

+        ]

+      }

+    ]

+  }

+]

Index: src/chrome/common/extensions/permissions/permission_set.cc

===================================================================

--- src/chrome/common/extensions/permissions/permission_set.cc  (revision 205727)

+++ src/chrome/common/extensions/permissions/permission_set.cc  (working copy)

@@ -44,6 +44,7 @@

   "events",

   "extension",

   "i18n",

+  "infobars",

   "omnibox",

   "pageAction",

   "pageActions",