diff options
| author | chron@google.com <chron@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-26 01:16:57 +0000 |
|---|---|---|
| committer | chron@google.com <chron@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-26 01:16:57 +0000 |
| commit | 4d48c393ad0143371d75f9d281811cd3f201a620 (patch) | |
| tree | b67f888be03a0a4d158deb3828b9c120fbd9204e /chrome/browser/sync | |
| parent | 4fe437b31b141afa9a0c44d58ffe8b138028efd7 (diff) | |
| download | chromium_src-4d48c393ad0143371d75f9d281811cd3f201a620.zip chromium_src-4d48c393ad0143371d75f9d281811cd3f201a620.tar.gz chromium_src-4d48c393ad0143371d75f9d281811cd3f201a620.tar.bz2 | |
Fix keyboard focus in initial sync dialogs.
Remove stray style tag that caused validation problems.
TEST=manually tested
BUG=28803,28801
Review URL: http://codereview.chromium.org/442019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/resources/merge_and_sync.html | 4 | ||||
| -rw-r--r-- | chrome/browser/sync/resources/setup_done.html | 3 | ||||
| -rw-r--r-- | chrome/browser/sync/resources/setup_flow.html | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | chrome/browser/sync/sync_setup_flow.cc | 8 |
4 files changed, 14 insertions, 3 deletions
diff --git a/chrome/browser/sync/resources/merge_and_sync.html b/chrome/browser/sync/resources/merge_and_sync.html index f350ae0..d902d10 100644 --- a/chrome/browser/sync/resources/merge_and_sync.html +++ b/chrome/browser/sync/resources/merge_and_sync.html @@ -54,6 +54,10 @@ html[dir='rtl'] .textaligned { + "</b></font></p>"; } + function onPageShown() { + document.getElementById("acceptMerge").focus(); + } + </script> </head> <body onload="setInterval(advanceThrobber, 30);"> diff --git a/chrome/browser/sync/resources/setup_done.html b/chrome/browser/sync/resources/setup_done.html index 897f191..4e5cf34 100644 --- a/chrome/browser/sync/resources/setup_done.html +++ b/chrome/browser/sync/resources/setup_done.html @@ -30,6 +30,9 @@ html[dir='rtl'] .endaligned { function setSyncedToUser(synced_to) { document.getElementById('user').innerHTML = synced_to; } + function onPageShown() { + document.getElementById("close").focus(); + } </script> <body bgcolor="#ffffff" vlink="#666666 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize" diff --git a/chrome/browser/sync/resources/setup_flow.html b/chrome/browser/sync/resources/setup_flow.html index 9bec21a..3601f76 100644 --- a/chrome/browser/sync/resources/setup_flow.html +++ b/chrome/browser/sync/resources/setup_flow.html @@ -1,6 +1,4 @@ <HTML id='t'> -<style type="text/css"> -</style> <HEAD> <TITLE></TITLE> <script> diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index 610527e..70d796e 100644..100755 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -114,8 +114,11 @@ void FlowHandler::ShowGaiaSuccessAndSettingUp() { } void FlowHandler::ShowMergeAndSync() { - if (dom_ui_) // NULL during testing. + if (dom_ui_) { // NULL during testing. dom_ui_->CallJavascriptFunction(L"showMergeAndSync"); + } + ExecuteJavascriptInIFrame(kMergeIFrameXPath, + L"onPageShown();"); } void FlowHandler::ShowSetupDone(const std::wstring& user) { @@ -129,6 +132,9 @@ void FlowHandler::ShowSetupDone(const std::wstring& user) { if (dom_ui_) dom_ui_->CallJavascriptFunction(L"showSetupDone", synced_to_string); + + ExecuteJavascriptInIFrame(kDoneIframeXPath, + L"onPageShown();"); } void FlowHandler::ShowFirstTimeDone(const std::wstring& user) { |