| Index: chrome/browser/ui/webui/sync_setup_handler.h
|
| diff --git a/chrome/browser/ui/webui/sync_setup_handler.h b/chrome/browser/ui/webui/sync_setup_handler.h
|
| index 155c21c6938c495a29e031d6e5c28155c18af90f..f5ddd9263197c6ca75f62463213622a34284d074 100644
|
| --- a/chrome/browser/ui/webui/sync_setup_handler.h
|
| +++ b/chrome/browser/ui/webui/sync_setup_handler.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/gtest_prod_util.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/timer.h"
|
| #include "chrome/browser/signin/signin_tracker.h"
|
| #include "chrome/browser/ui/webui/options2/options_ui2.h"
|
| #include "chrome/browser/ui/webui/signin/login_ui_service.h"
|
| @@ -139,6 +140,9 @@ class SyncSetupHandler : public options2::OptionsPageUIHandler,
|
| // is running in the background.
|
| void DisplaySpinner();
|
|
|
| + // Displays an error dialog which shows timeout of starting the sync backend.
|
| + void DisplayTimeout();
|
| +
|
| // Returns true if we're the active login object.
|
| bool IsActiveLogin() const;
|
|
|
| @@ -186,6 +190,10 @@ class SyncSetupHandler : public options2::OptionsPageUIHandler,
|
| // The error from the last signin attempt.
|
| GoogleServiceAuthError last_signin_error_;
|
|
|
| + // The OneShotTimer object used to timeout of starting the sync backend
|
| + // service.
|
| + scoped_ptr<base::OneShotTimer<SyncSetupHandler> > backend_start_timer_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler);
|
| };
|
|
|
|
|