← Back to branch summary

~webapps/unity-chromium-extension/12.10

« back to all changes in this revision

Viewing changes to chromium-patches/stable-23.0.1271.64/1-infobars.patch

  • Committer: Alexandre Abreu
  • Date: 2012-11-14 20:04:23 UTC
  • Revision ID: alexandre.abreu@canonical.com-20121114200423-9ro8j4zkn01dt42v
Update v23 patch to account for new infobars,json file; remove old v20 patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
chromium-patches/stable-23.0.1271.64/1-infobars.patch
45
45
   "pageActions",
46
46
Index: src/chrome/common/extensions/api/infobars.json
47
47
===================================================================
48
 
--- src/chrome/common/extensions/api/infobars.json      (revision 136242)
 
48
--- src/chrome/common/extensions/api/infobars.json      (revision 0)
49
49
+++ src/chrome/common/extensions/api/infobars.json      (working copy)
50
 
@@ -4,7 +4,7 @@
51
 
 
52
 
 [
53
 
   {
54
 
-    "namespace": "experimental.infobars",
 
50
@@ -0,0 +1,51 @@
 
51
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 
52
+// Use of this source code is governed by a BSD-style license that can be
 
53
+// found in the LICENSE file.
 
54
+
 
55
+[
 
56
+  {
55
57
+    "namespace": "infobars",
56
 
     "dependencies": [ "windows" ],
57
 
     "types": [],
58
 
     "functions": [
 
58
+    "dependencies": [ "windows" ],
 
59
+    "types": [],
 
60
+    "functions": [
 
61
+      {
 
62
+        "name": "show",
 
63
+        "type": "function",
 
64
+        "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.",
 
65
+        "parameters": [
 
66
+          {
 
67
+            "name": "details",
 
68
+            "type": "object",
 
69
+            "properties": {
 
70
+              "tabId": {
 
71
+                "type": "integer",
 
72
+                "description": "The tab id for the tab to display the infobar in."
 
73
+              },
 
74
+              "path": {
 
75
+                "type": "string",
 
76
+                "description": "The html file that contains the infobar."
 
77
+              },
 
78
+              "height": {
 
79
+                "type": "integer",
 
80
+                "description": "The height (in pixels) of the infobar to show. If omitted, the default infobar height will be used.",
 
81
+                "optional": true,
 
82
+                "minimum": 0,
 
83
+                "maximum": 72
 
84
+              }
 
85
+            }
 
86
+          },
 
87
+          {
 
88
+            "type": "function",
 
89
+            "name": "callback",
 
90
+            "optional": true,
 
91
+            "parameters": [
 
92
+              {
 
93
+                "name": "window", "$ref": "windows.Window", "description": "Contains details about the window in which the infobar was created."
 
94
+              }
 
95
+            ]
 
96
+          }
 
97
+        ]
 
98
+      }
 
99
+    ]
 
100
+  }
 
101
+]
59
102
Index: src/chrome/common/extensions/api/extension_api.cc
60
103
===================================================================
61
104
--- src/chrome/common/extensions/api/extension_api.cc   (revision 165188)