summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/extension_font_settings_api.cc33
-rw-r--r--chrome/browser/extensions/extension_font_settings_api.h14
-rw-r--r--chrome/browser/extensions/extension_function_registry.cc2
-rw-r--r--chrome/common/extensions/api/experimental.fontSettings.json52
-rw-r--r--chrome/common/extensions/docs/examples/api/fontSettings.zipbin10570 -> 11258 bytes
-rw-r--r--chrome/common/extensions/docs/examples/api/fontSettings/popup.html8
-rw-r--r--chrome/common/extensions/docs/examples/api/fontSettings/popup.js16
-rw-r--r--chrome/common/extensions/docs/experimental.fontSettings.html254
-rw-r--r--chrome/common/extensions/docs/samples.html6
-rw-r--r--chrome/common/extensions/docs/samples.json8
-rw-r--r--chrome/test/data/extensions/api_test/font_settings/test.js12
11 files changed, 396 insertions, 9 deletions
diff --git a/chrome/browser/extensions/extension_font_settings_api.cc b/chrome/browser/extensions/extension_font_settings_api.cc
index 3359264..3f76f8b 100644
--- a/chrome/browser/extensions/extension_font_settings_api.cc
+++ b/chrome/browser/extensions/extension_font_settings_api.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/extension_error_utils.h"
+#include "chrome/common/pref_names.h"
#include "content/public/browser/font_list_async.h"
namespace {
@@ -19,6 +20,7 @@ namespace {
const char kGenericFamilyKey[] = "genericFamily";
const char kFontNameKey[] = "fontName";
const char kLocalizedNameKey[] = "localizedName";
+const char kPixelSizeKey[] = "pixelSize";
const char kScriptKey[] = "script";
// Format for per-script font preference keys.
@@ -35,8 +37,7 @@ const char kWebKitGlobalFontPrefFormat[] =
// Gets the font name preference path from |details| which contains key
// |kGenericFamilyKey| and optionally |kScriptKey|.
-bool GetFontNamePrefPath(DictionaryValue* details, std::string* pref_path)
-{
+bool GetFontNamePrefPath(DictionaryValue* details, std::string* pref_path) {
std::string generic_family;
if (!details->GetString(kGenericFamilyKey, &generic_family))
return false;
@@ -110,8 +111,7 @@ void GetFontListFunction::FontListHasLoaded(scoped_ptr<ListValue> list) {
SendResponse(success);
}
-bool GetFontListFunction::CopyFontsToResult(ListValue* fonts)
-{
+bool GetFontListFunction::CopyFontsToResult(ListValue* fonts) {
scoped_ptr<ListValue> result(new ListValue());
for (ListValue::iterator it = fonts->begin(); it != fonts->end(); ++it) {
ListValue* font_list_value;
@@ -141,3 +141,28 @@ bool GetFontListFunction::CopyFontsToResult(ListValue* fonts)
result_.reset(result.release());
return true;
}
+
+bool GetDefaultFontSizeFunction::RunImpl() {
+ PrefService* prefs = profile_->GetPrefs();
+ int size = prefs->GetInteger(prefs::kWebKitGlobalDefaultFontSize);
+
+ DictionaryValue* result = new DictionaryValue();
+ result->SetInteger(kPixelSizeKey, size);
+ result_.reset(result);
+ return true;
+}
+
+bool SetDefaultFontSizeFunction::RunImpl() {
+ DictionaryValue* details = NULL;
+ EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &details));
+
+ int size;
+ EXTENSION_FUNCTION_VALIDATE(details->GetInteger(kPixelSizeKey, &size));
+
+ ExtensionPrefs* prefs = profile_->GetExtensionService()->extension_prefs();
+ prefs->SetExtensionControlledPref(extension_id(),
+ prefs::kWebKitGlobalDefaultFontSize,
+ kExtensionPrefsScopeRegular,
+ Value::CreateIntegerValue(size));
+ return true;
+}
diff --git a/chrome/browser/extensions/extension_font_settings_api.h b/chrome/browser/extensions/extension_font_settings_api.h
index f27e8be..49776f2 100644
--- a/chrome/browser/extensions/extension_font_settings_api.h
+++ b/chrome/browser/extensions/extension_font_settings_api.h
@@ -30,4 +30,18 @@ class GetFontListFunction : public AsyncExtensionFunction {
bool CopyFontsToResult(base::ListValue* fonts);
};
+class GetDefaultFontSizeFunction : public SyncExtensionFunction {
+ public:
+ virtual bool RunImpl() OVERRIDE;
+ DECLARE_EXTENSION_FUNCTION_NAME(
+ "experimental.fontSettings.getDefaultFontSize")
+};
+
+class SetDefaultFontSizeFunction : public SyncExtensionFunction {
+ public:
+ virtual bool RunImpl() OVERRIDE;
+ DECLARE_EXTENSION_FUNCTION_NAME(
+ "experimental.fontSettings.setDefaultFontSize")
+};
+
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_FONT_SETTINGS_API_H__
diff --git a/chrome/browser/extensions/extension_function_registry.cc b/chrome/browser/extensions/extension_function_registry.cc
index a6c3ebc..a6773b9 100644
--- a/chrome/browser/extensions/extension_function_registry.cc
+++ b/chrome/browser/extensions/extension_function_registry.cc
@@ -420,6 +420,8 @@ void ExtensionFunctionRegistry::ResetFunctions() {
RegisterFunction<GetFontListFunction>();
RegisterFunction<GetFontNameFunction>();
RegisterFunction<SetFontNameFunction>();
+ RegisterFunction<GetDefaultFontSizeFunction>();
+ RegisterFunction<SetDefaultFontSizeFunction>();
// ChromeAuth settings.
RegisterFunction<SetCloudPrintCredentialsFunction>();
diff --git a/chrome/common/extensions/api/experimental.fontSettings.json b/chrome/common/extensions/api/experimental.fontSettings.json
index bc08bb9..a84b8c6 100644
--- a/chrome/common/extensions/api/experimental.fontSettings.json
+++ b/chrome/common/extensions/api/experimental.fontSettings.json
@@ -125,6 +125,58 @@
]
}
]
+ },
+ {
+ "name": "getDefaultFontSize",
+ "type": "function",
+ "description": "Gets the default font size.",
+ "parameters": [
+ {
+ "name": "details",
+ "type": "object",
+ "description": "This parameter is currently unused."
+ },
+ {
+ "name": "callback",
+ "type": "function",
+ "optional": "true",
+ "parameters": [
+ {
+ "name": "details",
+ "type": "object",
+ "properties": {
+ "pixelSize": {
+ "type": "integer",
+ "description": "The font size in pixels."
+ }
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "setDefaultFontSize",
+ "type": "function",
+ "description": "Sets the default font size.",
+ "parameters": [
+ {
+ "name": "details",
+ "type": "object",
+ "properties": {
+ "pixelSize": {
+ "type": "integer",
+ "description": "The font size in pixels."
+ }
+ }
+ },
+ {
+ "type": "function",
+ "name": "callback",
+ "optional": "true",
+ "parameters": []
+ }
+ ]
}
]
}
diff --git a/chrome/common/extensions/docs/examples/api/fontSettings.zip b/chrome/common/extensions/docs/examples/api/fontSettings.zip
index 4edf70b..159e7f4 100644
--- a/chrome/common/extensions/docs/examples/api/fontSettings.zip
+++ b/chrome/common/extensions/docs/examples/api/fontSettings.zip
Binary files differ
diff --git a/chrome/common/extensions/docs/examples/api/fontSettings/popup.html b/chrome/common/extensions/docs/examples/api/fontSettings/popup.html
index 3e894ba..d4e542e 100644
--- a/chrome/common/extensions/docs/examples/api/fontSettings/popup.html
+++ b/chrome/common/extensions/docs/examples/api/fontSettings/popup.html
@@ -6,7 +6,7 @@
</head>
<body>
<h1>Font Settings</h1>
- <form id="fontForm">
+ <div>
<div>Script</div>
<div>
<select id="scriptList">
@@ -44,6 +44,7 @@
<option value="Yiii">Yi</option>
</select>
</div>
+ <div style="margin-left:10px">
<div>Standard</div>
<div>
<select id="standardFontList"></select>
@@ -60,6 +61,9 @@
<div>
<select id="fixedFontList"></select>
</div>
- </form>
+ </div>
+ <div>Font Size</div>
+ <div><input type="text" id="defaultFontSize"></div>
+ </div>
</body>
</html>
diff --git a/chrome/common/extensions/docs/examples/api/fontSettings/popup.js b/chrome/common/extensions/docs/examples/api/fontSettings/popup.js
index 14d6c5f..b8ec2ea 100644
--- a/chrome/common/extensions/docs/examples/api/fontSettings/popup.js
+++ b/chrome/common/extensions/docs/examples/api/fontSettings/popup.js
@@ -107,6 +107,16 @@ function updateListSelections() {
}
}
+function defaultFontSizeChanged() {
+ var defaultFontSizeInput = document.getElementById('defaultFontSize');
+ var pixelSize = parseInt(defaultFontSizeInput.value);
+ if (!isNaN(pixelSize)) {
+ chrome.experimental.fontSettings.setDefaultFontSize({
+ pixelSize: pixelSize
+ });
+ }
+}
+
function init() {
scriptList = document.getElementById('scriptList');
scriptList.addEventListener('change', updateListSelections);
@@ -120,6 +130,12 @@ function init() {
var handler = getFontChangeHandler(list, genericFamilies[i].name);
list.addEventListener('change', handler);
}
+
+ var defaultFontSizeInput = document.getElementById('defaultFontSize');
+ chrome.experimental.fontSettings.getDefaultFontSize({}, function(details) {
+ defaultFontSizeInput.value = details.pixelSize;
+ });
+ defaultFontSizeInput.addEventListener('change', defaultFontSizeChanged);
}
document.addEventListener('DOMContentLoaded', init);
diff --git a/chrome/common/extensions/docs/experimental.fontSettings.html b/chrome/common/extensions/docs/experimental.fontSettings.html
index 393397f..37b2468 100644
--- a/chrome/common/extensions/docs/experimental.fontSettings.html
+++ b/chrome/common/extensions/docs/experimental.fontSettings.html
@@ -198,10 +198,14 @@
<a href="#global-methods">Methods</a>
<ol>
<li>
+ <a href="#method-getDefaultFontSize">getDefaultFontSize</a>
+ </li><li>
<a href="#method-getFontList">getFontList</a>
</li><li>
<a href="#method-getFontName">getFontName</a>
</li><li>
+ <a href="#method-setDefaultFontSize">setDefaultFontSize</a>
+ </li><li>
<a href="#method-setFontName">setFontName</a>
</li>
</ol>
@@ -239,6 +243,143 @@
<h3>Methods</h3>
<!-- iterates over all functions -->
<div class="apiItem">
+ <a name="method-getDefaultFontSize"></a> <!-- method-anchor -->
+ <h4>getDefaultFontSize</h4>
+ <div class="summary">
+ <!-- Note: intentionally longer 80 columns -->
+ <span>chrome.experimental.fontSettings.getDefaultFontSize</span>(<span class="null"><span>object</span>
+ <var><span>details</span></var></span><span class="optional"><span>, </span><span>function</span>
+ <var><span>callback</span></var></span>)</div>
+ <div class="description">
+ <p>Gets the default font size.</p>
+ <!-- PARAMETERS -->
+ <h4>Parameters</h4>
+ <dl>
+ <div>
+ <div>
+ <dt>
+ <var>details</var>
+ <em>
+ <!-- TYPE -->
+ <div style="display:inline">
+ (
+ <span id="typeTemplate">
+ <span>
+ <span>object</span>
+ </span>
+ </span>
+ )
+ </div>
+ </em>
+ </dt>
+ <dd>This parameter is currently unused.</dd>
+ <!-- OBJECT PROPERTIES -->
+ <!-- OBJECT METHODS -->
+ <!-- OBJECT EVENT FIELDS -->
+ <!-- FUNCTION PARAMETERS -->
+ </div>
+ </div><div>
+ <div>
+ <dt>
+ <var>callback</var>
+ <em>
+ <!-- TYPE -->
+ <div style="display:inline">
+ (
+ <span class="optional">optional</span>
+ <span id="typeTemplate">
+ <span>
+ <span>function</span>
+ </span>
+ </span>
+ )
+ </div>
+ </em>
+ </dt>
+ <dd class="todo">
+ Undocumented.
+ </dd>
+ <!-- OBJECT PROPERTIES -->
+ <!-- OBJECT METHODS -->
+ <!-- OBJECT EVENT FIELDS -->
+ <!-- FUNCTION PARAMETERS -->
+ </div>
+ </div>
+ </dl>
+ <!-- RETURNS -->
+ <dl>
+ </dl>
+ <!-- CALLBACK -->
+ <div>
+ <div>
+ <h4>Callback function</h4>
+ <p>
+ If you specify the <em>callback</em> parameter, it should
+ specify a function that looks like this:
+ </p>
+ <!-- Note: intentionally longer 80 columns -->
+ <pre>function(<span>object details</span>) <span class="subdued">{...}</span>;</pre>
+ <dl>
+ <div>
+ <div>
+ <dt>
+ <var>details</var>
+ <em>
+ <!-- TYPE -->
+ <div style="display:inline">
+ (
+ <span id="typeTemplate">
+ <span>
+ <span>object</span>
+ </span>
+ </span>
+ )
+ </div>
+ </em>
+ </dt>
+ <dd class="todo">
+ Undocumented.
+ </dd>
+ <!-- OBJECT PROPERTIES -->
+ <dd>
+ <dl>
+ <div>
+ <div>
+ <dt>
+ <var>pixelSize</var>
+ <em>
+ <!-- TYPE -->
+ <div style="display:inline">
+ (
+ <span id="typeTemplate">
+ <span>
+ <span>integer</span>
+ </span>
+ </span>
+ )
+ </div>
+ </em>
+ </dt>
+ <dd>The font size in pixels.</dd>
+ <!-- OBJECT PROPERTIES -->
+ <!-- OBJECT METHODS -->
+ <!-- OBJECT EVENT FIELDS -->
+ <!-- FUNCTION PARAMETERS -->
+ </div>
+ </div>
+ </dl>
+ </dd>
+ <!-- OBJECT METHODS -->
+ <!-- OBJECT EVENT FIELDS -->
+ <!-- FUNCTION PARAMETERS -->
+ </div>
+ </div>
+ </dl>
+ </div>
+ </div>
+ <!-- MIN_VERSION -->
+ </div> <!-- /description -->
+ </div><div class="apiItem">
<a name="method-getFontList"></a> <!-- method-anchor -->
<h4>getFontList</h4>
<div class="summary">
@@ -524,6 +665,119 @@
<!-- MIN_VERSION -->
</div> <!-- /description -->
</div><div class="apiItem">
+ <a name="method-setDefaultFontSize"></a> <!-- method-anchor -->
+ <h4>setDefaultFontSize</h4>
+ <div class="summary">
+ <!-- Note: intentionally longer 80 columns -->
+ <span>chrome.experimental.fontSettings.setDefaultFontSize</span>(<span class="null"><span>object</span>
+ <var><span>details</span></var></span><span class="optional"><span>, </span><span>function</span>
+ <var><span>callback</span></var></span>)</div>
+ <div class="description">
+ <p>Sets the default font size.</p>
+ <!-- PARAMETERS -->
+ <h4>Parameters</h4>
+ <dl>
+ <div>
+ <div>
+ <dt>
+ <var>details</var>
+ <em>
+ <!-- TYPE -->
+ <div style="display:inline">
+ (
+ <span id="typeTemplate">
+ <span>
+ <span>object</span>
+ </span>
+ </span>
+ )
+ </div>
+ </em>
+ </dt>
+ <dd class="todo">
+ Undocumented.
+ </dd>
+ <!-- OBJECT PROPERTIES -->
+ <dd>
+ <dl>
+ <div>
+ <div>
+ <dt>
+ <var>pixelSize</var>
+ <em>
+ <!-- TYPE -->
+ <div style="display:inline">
+ (
+ <span id="typeTemplate">
+ <span>
+ <span>integer</span>
+ </span>
+ </span>
+ )
+ </div>
+ </em>
+ </dt>
+ <dd>The font size in pixels.</dd>
+ <!-- OBJECT PROPERTIES -->
+ <!-- OBJECT METHODS -->
+ <!-- OBJECT EVENT FIELDS -->
+ <!-- FUNCTION PARAMETERS -->
+ </div>
+ </div>
+ </dl>
+ </dd>
+ <!-- OBJECT METHODS -->
+ <!-- OBJECT EVENT FIELDS -->
+ <!-- FUNCTION PARAMETERS -->
+ </div>
+ </div><div>
+ <div>
+ <dt>
+ <var>callback</var>
+ <em>
+ <!-- TYPE -->
+ <div style="display:inline">
+ (
+ <span class="optional">optional</span>
+ <span id="typeTemplate">
+ <span>
+ <span>function</span>
+ </span>
+ </span>
+ )
+ </div>
+ </em>
+ </dt>
+ <dd class="todo">
+ Undocumented.
+ </dd>
+ <!-- OBJECT PROPERTIES -->
+ <!-- OBJECT METHODS -->
+ <!-- OBJECT EVENT FIELDS -->
+ <!-- FUNCTION PARAMETERS -->
+ </div>
+ </div>
+ </dl>
+ <!-- RETURNS -->
+ <dl>
+ </dl>
+ <!-- CALLBACK -->
+ <div>
+ <div>
+ <h4>Callback function</h4>
+ <p>
+ If you specify the <em>callback</em> parameter, it should
+ specify a function that looks like this:
+ </p>
+ <!-- Note: intentionally longer 80 columns -->
+ <pre>function(<span></span>) <span class="subdued">{...}</span>;</pre>
+ <dl>
+ </dl>
+ </div>
+ </div>
+ <!-- MIN_VERSION -->
+ </div> <!-- /description -->
+ </div><div class="apiItem">
<a name="method-setFontName"></a> <!-- method-anchor -->
<h4>setFontName</h4>
<div class="summary">
diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html
index d0f7291..1504978 100644
--- a/chrome/common/extensions/docs/samples.html
+++ b/chrome/common/extensions/docs/samples.html
@@ -219,7 +219,7 @@
"028eb5364924344029bcbe1d527f132fc72b34e5": "EMAIL THIS PAGE (BY GOOGLE) THIS EXTENSION ADDS AN EMAIL BUTTON TO THE TOOLBAR WHICH ALLOWS YOU TO EMAIL THE PAGE LINK USING YOUR DEFAULT MAIL CLIENT OR GMAIL. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXTENSION.CONNECT CHROME.EXTENSION.ONCONNECT CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.UPDATE",
"763a08e9b06595d785568a8d392b95a2f3700258": "EVENT TRACKING WITH GOOGLE ANALYTICS A SAMPLE EXTENSION WHICH USES GOOGLE ANALYTICS TO TRACK USAGE. BROWSER_ACTION",
"4efa12eaaa442b6b7c880e7a38ceeb0cff7e8b77": "FIREPHP FOR CHROME EXTENDS THE DEVELOPER TOOLS, ADDING SUPPORT FOR PARSING FIREPHP MESSAGES FROM SERVER BACKGROUND_PAGE DEVTOOLS_PAGE TABS CHROME.DEVTOOLS.NETWORK.GETHAR CHROME.DEVTOOLS.NETWORK.ONREQUESTFINISHED CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.TABS.EXECUTESCRIPT",
- "31d10fd5e61ca51eb59073b358d4ab5267cbf318": "FONT SETTINGS SAMPLE EXTENSION FOR FONT SETTINGS API BROWSER_ACTION EXPERIMENTAL POPUP CHROME.EXPERIMENTAL.FONTSETTINGS.GETFONTLIST CHROME.EXPERIMENTAL.FONTSETTINGS.GETFONTNAME CHROME.EXPERIMENTAL.FONTSETTINGS.SETFONTNAME",
+ "31d10fd5e61ca51eb59073b358d4ab5267cbf318": "FONT SETTINGS SAMPLE EXTENSION FOR FONT SETTINGS API BROWSER_ACTION EXPERIMENTAL POPUP CHROME.EXPERIMENTAL.FONTSETTINGS.GETDEFAULTFONTSIZE CHROME.EXPERIMENTAL.FONTSETTINGS.GETFONTLIST CHROME.EXPERIMENTAL.FONTSETTINGS.GETFONTNAME CHROME.EXPERIMENTAL.FONTSETTINGS.SETDEFAULTFONTSIZE CHROME.EXPERIMENTAL.FONTSETTINGS.SETFONTNAME",
"8b0dd31216235941bdd8eb33fda915ef5cf79a82": "GOOGLE CALENDAR CHECKER (BY GOOGLE) QUICKLY SEE THE TIME UNTIL YOUR NEXT MEETING FROM ANY OF YOUR CALENDARS. CLICK ON THE BUTTON TO BE TAKEN TO YOUR CALENDAR. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETICON CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONUPDATED CHROME.TABS.UPDATE",
"4e35caa9742fb82dbd628892d23a781614f6eff6": "GOOGLE DOCUMENT LIST VIEWER DEMONSTRATES HOW TO USE OAUTH TO CONNECT THE GOOGLE DOCUMENTS LIST DATA API. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.SETBADGETEXT CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE",
"bb57f7a0132cbeb36ad7e7bb0ab75c21704234ca": "GOOGLE MAIL CHECKER DISPLAYS THE NUMBER OF UNREAD MESSAGES IN YOUR GOOGLE MAIL INBOX. YOU CAN ALSO CLICK THE BUTTON TO OPEN YOUR INBOX. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONUPDATED CHROME.TABS.UPDATE",
@@ -1438,10 +1438,14 @@
<div class="apicalls"><strong>Calls:</strong>
<ul>
<li>
+ <code><a href="experimental.fontSettings.html#method-getDefaultFontSize">chrome.experimental.fontSettings.getDefaultFontSize</a></code>
+ </li><li>
<code><a href="experimental.fontSettings.html#method-getFontList">chrome.experimental.fontSettings.getFontList</a></code>
</li><li>
<code><a href="experimental.fontSettings.html#method-getFontName">chrome.experimental.fontSettings.getFontName</a></code>
</li><li>
+ <code><a href="experimental.fontSettings.html#method-setDefaultFontSize">chrome.experimental.fontSettings.setDefaultFontSize</a></code>
+ </li><li>
<code><a href="experimental.fontSettings.html#method-setFontName">chrome.experimental.fontSettings.setFontName</a></code>
</li>
</ul>
diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json
index 7657856..3f7175d 100644
--- a/chrome/common/extensions/docs/samples.json
+++ b/chrome/common/extensions/docs/samples.json
@@ -102,8 +102,10 @@
"chrome.experimental.devtools.console.onMessageAdded": "experimental.devtools.console.html#event-onMessageAdded",
"chrome.experimental.downloads.download": "experimental.downloads.html#method-download",
"chrome.experimental.extension.onInstalled": "experimental.extension.html#event-onInstalled",
+ "chrome.experimental.fontSettings.getDefaultFontSize": "experimental.fontSettings.html#method-getDefaultFontSize",
"chrome.experimental.fontSettings.getFontList": "experimental.fontSettings.html#method-getFontList",
"chrome.experimental.fontSettings.getFontName": "experimental.fontSettings.html#method-getFontName",
+ "chrome.experimental.fontSettings.setDefaultFontSize": "experimental.fontSettings.html#method-setDefaultFontSize",
"chrome.experimental.fontSettings.setFontName": "experimental.fontSettings.html#method-setFontName",
"chrome.experimental.infobars.show": "experimental.infobars.html#method-show",
"chrome.experimental.keybinding.onCommand": "experimental.keybinding.html#event-onCommand",
@@ -1041,8 +1043,10 @@
},
{
"api_calls": [
+ "chrome.experimental.fontSettings.getDefaultFontSize",
"chrome.experimental.fontSettings.getFontList",
"chrome.experimental.fontSettings.getFontName",
+ "chrome.experimental.fontSettings.setDefaultFontSize",
"chrome.experimental.fontSettings.setFontName"
],
"crx_path": null,
@@ -1058,13 +1062,13 @@
"packaged_app": false,
"path": "examples\/api\/fontSettings\/",
"protocols": [],
- "search_string": "FONT SETTINGS SAMPLE EXTENSION FOR FONT SETTINGS API BROWSER_ACTION EXPERIMENTAL POPUP CHROME.EXPERIMENTAL.FONTSETTINGS.GETFONTLIST CHROME.EXPERIMENTAL.FONTSETTINGS.GETFONTNAME CHROME.EXPERIMENTAL.FONTSETTINGS.SETFONTNAME",
+ "search_string": "FONT SETTINGS SAMPLE EXTENSION FOR FONT SETTINGS API BROWSER_ACTION EXPERIMENTAL POPUP CHROME.EXPERIMENTAL.FONTSETTINGS.GETDEFAULTFONTSIZE CHROME.EXPERIMENTAL.FONTSETTINGS.GETFONTLIST CHROME.EXPERIMENTAL.FONTSETTINGS.GETFONTNAME CHROME.EXPERIMENTAL.FONTSETTINGS.SETDEFAULTFONTSIZE CHROME.EXPERIMENTAL.FONTSETTINGS.SETFONTNAME",
"source_files": [
"manifest.json",
"popup.html",
"popup.js"
],
- "source_hash": "8d5bfbc7f8578f6a0f70602cc5e360f1c6138588",
+ "source_hash": "b5febada226fcd2d38461121c039c55ebcb3decf",
"zip_path": "examples\/api\/fontSettings.zip"
},
{
diff --git a/chrome/test/data/extensions/api_test/font_settings/test.js b/chrome/test/data/extensions/api_test/font_settings/test.js
index bef1e37..2c8ec15 100644
--- a/chrome/test/data/extensions/api_test/font_settings/test.js
+++ b/chrome/test/data/extensions/api_test/font_settings/test.js
@@ -56,5 +56,17 @@ chrome.test.runTests([
chrome.test.assertEq('string', typeof(value[0].fontName), message);
chrome.test.assertEq('string', typeof(value[0].localizedName), message);
}));
+ },
+
+ function setDefaultFontSize() {
+ fs.setDefaultFontSize({
+ pixelSize: 22
+ }, chrome.test.callbackPass());
+ },
+
+ function getDefaultFontSize() {
+ var expected = 22;
+ var message = 'Setting for default font size should be ' + expected;
+ fs.getDefaultFontSize({}, expect({pixelSize: expected}, message));
}
]);
generated by cgit v1.1 at 2025-02-07 21:15:04 +0000