1
Index: src/chrome/common/extensions_api_resources.grd
2
===================================================================
3
--- src/chrome/common/extensions_api_resources.grd (revision 179520)
4
+++ src/chrome/common/extensions_api_resources.grd (working copy)
6
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_ACCESSIBILITY" file="extensions\api\experimental_accessibility.json" type="BINDATA" />
7
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_APP" file="extensions\api\experimental_app.json" type="BINDATA" />
8
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_HISTORY" file="extensions\api\experimental_history.json" type="BINDATA" />
9
- <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS" file="extensions\api\experimental_infobars.json" type="BINDATA" />
10
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD" file="extensions\api\experimental_input_virtual_keyboard.json" type="BINDATA" />
11
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_POWER" file="extensions\api\experimental_power.json" type="BINDATA" />
12
<include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_PROCESSES" file="extensions\api\experimental_processes.json" type="BINDATA" />
14
<include name="IDR_EXTENSION_API_JSON_I18N" file="extensions\api\i18n.json" type="BINDATA" />
15
<include name="IDR_EXTENSION_API_JSON_INPUT_IME" file="extensions\api\input_ime.json" type="BINDATA" />
16
<include name="IDR_EXTENSION_API_JSON_IDLE" file="extensions\api\idle.json" type="BINDATA" />
17
+ <include name="IDR_EXTENSION_API_JSON_INFOBARS" file="extensions\api\infobars.json" type="BINDATA" />
18
<include name="IDR_EXTENSION_API_JSON_INPUTMETHODPRIVATE" file="extensions\api\input_method_private.json" type="BINDATA" />
19
<include name="IDR_EXTENSION_API_JSON_MANAGEDMODEPRIVATE" file="extensions\api\managed_mode_private.json" type="BINDATA" />
20
<include name="IDR_EXTENSION_API_JSON_MANAGEMENT" file="extensions\api\management.json" type="BINDATA" />
21
Index: src/chrome/common/extensions/api/extension_api.cc
22
===================================================================
23
--- src/chrome/common/extensions/api/extension_api.cc (revision 179520)
24
+++ src/chrome/common/extensions/api/extension_api.cc (working copy)
26
IDR_EXTENSION_API_JSON_EXPERIMENTAL_APP));
27
RegisterSchema("experimental.history", ReadFromResource(
28
IDR_EXTENSION_API_JSON_EXPERIMENTAL_HISTORY));
29
- RegisterSchema("experimental.infobars", ReadFromResource(
30
- IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS));
31
RegisterSchema("experimental.input.virtualKeyboard", ReadFromResource(
32
IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD));
33
RegisterSchema("experimental.power", ReadFromResource(
35
IDR_EXTENSION_API_JSON_I18N));
36
RegisterSchema("idle", ReadFromResource(
37
IDR_EXTENSION_API_JSON_IDLE));
38
+ RegisterSchema("infobars", ReadFromResource(
39
+ IDR_EXTENSION_API_JSON_INFOBARS));
40
RegisterSchema("input.ime", ReadFromResource(
41
IDR_EXTENSION_API_JSON_INPUT_IME));
42
RegisterSchema("inputMethodPrivate", ReadFromResource(
43
Index: src/chrome/common/extensions/api/experimental_infobars.json
44
===================================================================
45
--- src/chrome/common/extensions/api/experimental_infobars.json (revision 179520)
46
+++ src/chrome/common/extensions/api/experimental_infobars.json (working copy)
48
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
49
-// Use of this source code is governed by a BSD-style license that can be
50
-// found in the LICENSE file.
54
- "namespace": "experimental.infobars",
55
- "dependencies": [ "windows" ],
61
- "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.",
69
- "description": "The tab id for the tab to display the infobar in."
73
- "description": "The html file that contains the infobar."
77
- "description": "The height (in pixels) of the infobar to show. If omitted, the default infobar height will be used.",
90
- "name": "window", "$ref": "windows.Window", "description": "Contains details about the window in which the infobar was created."
99
Index: src/chrome/common/extensions/permissions/permission_set.cc
100
===================================================================
101
--- src/chrome/common/extensions/permissions/permission_set.cc (revision 179520)
102
+++ src/chrome/common/extensions/permissions/permission_set.cc (working copy)
111
Index: src/chrome/browser/infobars/infobar_extension_api.h
112
===================================================================
113
--- src/chrome/browser/infobars/infobar_extension_api.h (revision 179520)
114
+++ src/chrome/browser/infobars/infobar_extension_api.h (working copy)
116
class ShowInfoBarFunction : public SyncExtensionFunction {
117
virtual ~ShowInfoBarFunction() {}
118
virtual bool RunImpl() OVERRIDE;
119
- DECLARE_EXTENSION_FUNCTION_NAME("experimental.infobars.show")
120
+ DECLARE_EXTENSION_FUNCTION_NAME("infobars.show")
123
#endif // CHROME_BROWSER_INFOBARS_INFOBAR_EXTENSION_API_H_
124
Index: src/chrome/common/extensions/api/infobars.json
125
===================================================================
126
--- src/chrome/common/extensions/api/infobars.json (revision 0)
127
+++ src/chrome/common/extensions/api/infobars.json (working copy)
129
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
130
+// Use of this source code is governed by a BSD-style license that can be
131
+// found in the LICENSE file.
135
+ "namespace": "infobars",
136
+ "dependencies": [ "windows" ],
141
+ "type": "function",
142
+ "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.",
150
+ "description": "The tab id for the tab to display the infobar in."
154
+ "description": "The html file that contains the infobar."
158
+ "description": "The height (in pixels) of the infobar to show. If omitted, the default infobar height will be used.",
166
+ "type": "function",
167
+ "name": "callback",
171
+ "name": "window", "$ref": "windows.Window", "description": "Contains details about the window in which the infobar was created."