| Index: chrome/browser/ui/webui/options/sync_setup_handler.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/options/sync_setup_handler.cc (revision 84869)
|
| +++ chrome/browser/ui/webui/options/sync_setup_handler.cc (working copy)
|
| @@ -255,18 +255,18 @@
|
| }
|
|
|
| void SyncSetupHandler::RegisterMessages() {
|
| - web_ui_->RegisterMessageCallback("didShowPage",
|
| - NewCallback(this, &SyncSetupHandler::OnDidShowPage));
|
| - web_ui_->RegisterMessageCallback("didClosePage",
|
| + web_ui_->RegisterMessageCallback("SyncSetupDidClosePage",
|
| NewCallback(this, &SyncSetupHandler::OnDidClosePage));
|
| - web_ui_->RegisterMessageCallback("SubmitAuth",
|
| + web_ui_->RegisterMessageCallback("SyncSetupSubmitAuth",
|
| NewCallback(this, &SyncSetupHandler::HandleSubmitAuth));
|
| - web_ui_->RegisterMessageCallback("Configure",
|
| + web_ui_->RegisterMessageCallback("SyncSetupConfigure",
|
| NewCallback(this, &SyncSetupHandler::HandleConfigure));
|
| - web_ui_->RegisterMessageCallback("Passphrase",
|
| + web_ui_->RegisterMessageCallback("SyncSetupPassphrase",
|
| NewCallback(this, &SyncSetupHandler::HandlePassphraseEntry));
|
| - web_ui_->RegisterMessageCallback("PassphraseCancel",
|
| + web_ui_->RegisterMessageCallback("SyncSetupPassphraseCancel",
|
| NewCallback(this, &SyncSetupHandler::HandlePassphraseCancel));
|
| + web_ui_->RegisterMessageCallback("SyncSetupAttachHandler",
|
| + NewCallback(this, &SyncSetupHandler::HandleAttachHandler));
|
| }
|
|
|
| void SyncSetupHandler::ShowGaiaLogin(const DictionaryValue& args) {
|
| @@ -311,17 +311,6 @@
|
| flow_ = flow;
|
| }
|
|
|
| -void SyncSetupHandler::OnDidShowPage(const ListValue* args) {
|
| - DCHECK(web_ui_);
|
| -
|
| - ProfileSyncService* sync_service =
|
| - web_ui_->GetProfile()->GetProfileSyncService();
|
| - if (!sync_service)
|
| - return;
|
| -
|
| - flow_ = sync_service->get_wizard().AttachSyncSetupHandler(this);
|
| -}
|
| -
|
| void SyncSetupHandler::OnDidClosePage(const ListValue* args) {
|
| flow_->OnDialogClosed(std::string());
|
| flow_ = NULL;
|
| @@ -397,3 +386,16 @@
|
| DCHECK(flow_);
|
| flow_->OnPassphraseCancel();
|
| }
|
| +
|
| +void SyncSetupHandler::HandleAttachHandler(const ListValue* args) {
|
| + DCHECK(web_ui_);
|
| +
|
| + ProfileSyncService* sync_service =
|
| + web_ui_->GetProfile()->GetProfileSyncService();
|
| + if (!sync_service)
|
| + return;
|
| +
|
| + if (!flow_)
|
| + flow_ = sync_service->get_wizard().AttachSyncSetupHandler(this);
|
| +}
|
| +
|
|
|