Fix keyboard focus in initial sync dialogs.

chrome/browser/sync/sync_setup_flow.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sync_setup_flow.h"
 
 #include "app/gfx/font.h"
 #include "app/gfx/font_util.h"
 #include "base/histogram.h"
 #include "base/json/json_reader.h"
@@ skipping 96 matching lines @@
 void FlowHandler::ShowGaiaSuccessAndClose() {
   ExecuteJavascriptInIFrame(kLoginIFrameXPath, L"showGaiaSuccessAndClose();");
 }
 
 void FlowHandler::ShowGaiaSuccessAndSettingUp() {
   ExecuteJavascriptInIFrame(kLoginIFrameXPath,
                             L"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) {
   StringValue synced_to_string(WideToUTF8(l10n_util::GetStringF(
       IDS_SYNC_NTP_SYNCED_TO, user)));
   std::string json;
   base::JSONWriter::Write(&synced_to_string, false, &json);
   std::wstring javascript = std::wstring(L"setSyncedToUser") +
       L"(" + UTF8ToWide(json) + L");";
   ExecuteJavascriptInIFrame(kDoneIframeXPath, javascript);
 
   if (dom_ui_)
     dom_ui_->CallJavascriptFunction(L"showSetupDone", synced_to_string);
+
+  ExecuteJavascriptInIFrame(kDoneIframeXPath,
+                            L"onPageShown();");
 }
 
 void FlowHandler::ShowFirstTimeDone(const std::wstring& user) {
   ExecuteJavascriptInIFrame(kDoneIframeXPath,
                             L"setShowFirstTimeSetupSummary();");
   ShowSetupDone(user);
 }
 
 void FlowHandler::ShowMergeAndSyncError() {
   ExecuteJavascriptInIFrame(kMergeIFrameXPath, L"showMergeAndSyncError();");
@@ skipping 198 matching lines @@
     // being able to intercept ShowHtmlDialog() calls.
 #if defined(OS_MACOSX)
     html_dialog_window_controller::ShowHtmlDialog(flow, service->profile());
 #else
     delete flow;
     return NULL;
 #endif
   }
   return flow;
 }