Fix some problems with the ENTER_PASSPHRASE state in sync setup....

chrome/browser/cocoa/preferences_window_controller.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/cocoa/preferences_window_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
@@ skipping 1334 matching lines @@
 
   if (!browser || !browser->GetSelectedTabContents())
     browser = Browser::Create(profile_);
   browser->OpenPrivacyDashboardTabAndActivate();
 }
 
 // Called when the user clicks the "Customize Sync" button in the
 // "Personal Stuff" pane.  Spawns a dialog-modal sheet that cleans
 // itself up on close.
 - (IBAction)doSyncCustomize:(id)sender {
-  syncService_->ShowChooseDataTypes(NULL);
+  syncService_->ShowConfigure(NULL);
 }
 
 - (IBAction)doSyncReauthentication:(id)sender {
   DCHECK(syncService_ && !syncService_->IsManaged());
   syncService_->ShowLoginDialog(NULL);
 }
 
 - (void)setPasswordManagerEnabledIndex:(NSInteger)value {
   if (value == kEnabledIndex)
     [self recordUserAction:UserMetricsAction(
@@ skipping 746 matching lines @@
     case OPTIONS_PAGE_ADVANCED:
       return underTheHoodView_;
     case OPTIONS_PAGE_DEFAULT:
     case OPTIONS_PAGE_COUNT:
       LOG(DFATAL) << "Invalid page value " << page;
   }
   return basicsView_;
 }
 
 @end