projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
resources
/
options
/
options.js
diff --git
a/src/chrome/browser/resources/options/options.js
b/src/chrome/browser/resources/options/options.js
index
9b6ef9f
..
7b46bec
100644
(file)
--- a/
src/chrome/browser/resources/options/options.js
+++ b/
src/chrome/browser/resources/options/options.js
@@
-92,8
+92,8
@@
function load() {
'doNotTrackConfirm',
loadTimeData.getString('doNotTrackConfirmOverlayTabTitle'),
'do-not-track-confirm-overlay',
'doNotTrackConfirm',
loadTimeData.getString('doNotTrackConfirmOverlayTabTitle'),
'do-not-track-confirm-overlay',
- /** @type {HTML
Input
Element} */($('do-not-track-confirm-ok')),
- /** @type {HTML
Input
Element} */($('do-not-track-confirm-cancel')),
+ /** @type {HTML
Button
Element} */($('do-not-track-confirm-ok')),
+ /** @type {HTML
Button
Element} */($('do-not-track-confirm-cancel')),
$('do-not-track-enabled')['pref'],
$('do-not-track-enabled')['metric']),
BrowserOptions.getInstance());
$('do-not-track-enabled')['pref'],
$('do-not-track-enabled')['metric']),
BrowserOptions.getInstance());
@@
-105,8
+105,8
@@
function load() {
'spellingConfirm',
loadTimeData.getString('spellingConfirmOverlayTabTitle'),
'spelling-confirm-overlay',
'spellingConfirm',
loadTimeData.getString('spellingConfirmOverlayTabTitle'),
'spelling-confirm-overlay',
- /** @type {HTML
Input
Element} */($('spelling-confirm-ok')),
- /** @type {HTML
Input
Element} */($('spelling-confirm-cancel')),
+ /** @type {HTML
Button
Element} */($('spelling-confirm-ok')),
+ /** @type {HTML
Button
Element} */($('spelling-confirm-cancel')),
$('spelling-enabled-control')['pref'],
$('spelling-enabled-control')['metric']),
BrowserOptions.getInstance());
$('spelling-enabled-control')['pref'],
$('spelling-enabled-control')['metric']),
BrowserOptions.getInstance());
@@
-218,6
+218,9
@@
function load() {
[$('pointer-settings-button')]);
PageManager.registerOverlay(PreferredNetworks.getInstance(),
BrowserOptions.getInstance());
[$('pointer-settings-button')]);
PageManager.registerOverlay(PreferredNetworks.getInstance(),
BrowserOptions.getInstance());
+ PageManager.registerOverlay(PowerOverlay.getInstance(),
+ BrowserOptions.getInstance(),
+ [$('power-settings-button')]);
PageManager.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(),
LanguageOptions.getInstance());
}
PageManager.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(),
LanguageOptions.getInstance());
}