| Index: chrome/browser/sync/glue/typed_url_data_type_controller.h
|
| ===================================================================
|
| --- chrome/browser/sync/glue/typed_url_data_type_controller.h (revision 48898)
|
| +++ chrome/browser/sync/glue/typed_url_data_type_controller.h (working copy)
|
| @@ -5,6 +5,8 @@
|
| #ifndef CHROME_BROWSER_SYNC_GLUE_TYPED_URL_DATA_TYPE_CONTROLLER_H__
|
| #define CHROME_BROWSER_SYNC_GLUE_TYPED_URL_DATA_TYPE_CONTROLLER_H__
|
|
|
| +#include <string>
|
| +
|
| #include "base/basictypes.h"
|
| #include "base/scoped_ptr.h"
|
| #include "chrome/browser/cancelable_request.h"
|
| @@ -64,7 +66,8 @@
|
| }
|
|
|
| // UnrecoverableHandler implementation
|
| - virtual void OnUnrecoverableError();
|
| + virtual void OnUnrecoverableError(const tracked_objects::Location& from_here,
|
| + const std::string& message);
|
|
|
| // NotificationObserver implementation.
|
| virtual void Observe(NotificationType type,
|
| @@ -84,7 +87,8 @@
|
| void StartDoneImpl(StartResult result, State state);
|
| void StopImpl();
|
| void StartFailed(StartResult result);
|
| - void OnUnrecoverableErrorImpl();
|
| + void OnUnrecoverableErrorImpl(const tracked_objects::Location& from_here,
|
| + const std::string& message);
|
|
|
| void set_state(State state) {
|
| DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
|
|
|