Fix keyboard focus in initial sync dialogs.

chrome/browser/sync/sync_setup_flow.cc

Index: chrome/browser/sync/sync_setup_flow.cc
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index 610527ebc111811b11fc12bc6e405387015bbc16..22263790a8de750123041ff2bd3702c3e97f9052 100644
--- 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.
-    dom_ui_->CallJavascriptFunction(L"showMergeAndSync");
+  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) {