| 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 8230ce96c11912a24bd9a7cb17de81e3ea2e3c16..e5ae24c8c8a6d692ce17bef0b5446fd72e5be977 100644
|
| --- a/chrome/browser/sync/sync_setup_flow.cc
|
| +++ b/chrome/browser/sync/sync_setup_flow.cc
|
| @@ -191,6 +191,10 @@ bool SyncSetupFlow::AttachSyncSetupHandler(SyncSetupFlowHandler* handler) {
|
| return true;
|
| }
|
|
|
| +bool SyncSetupFlow::IsAttached() const {
|
| + return flow_handler_ != NULL;
|
| +}
|
| +
|
| void SyncSetupFlow::Advance(SyncSetupWizard::State advance_state) {
|
| if (!ShouldAdvance(advance_state)) {
|
| LOG(WARNING) << "Invalid state change from "
|
| @@ -198,7 +202,8 @@ void SyncSetupFlow::Advance(SyncSetupWizard::State advance_state) {
|
| return;
|
| }
|
|
|
| - ActivateState(advance_state);
|
| + if (flow_handler_)
|
| + ActivateState(advance_state);
|
| }
|
|
|
| void SyncSetupFlow::Focus() {
|
|
|