diff options
| author | Ben Murdoch <benm@google.com> | 2014-03-31 11:51:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-03-31 11:51:25 +0100 |
| commit | effb81e5f8246d0db0270817048dc992db66e9fb (patch) | |
| tree | cc45ced7dfde038c8f3d022ee1eeac207a68761e /chrome/browser/signin/signin_error_notifier_ash.h | |
| parent | 4d26337013537c1acafbcb63b9b2b7e404c3adc9 (diff) | |
| download | chromium_org-effb81e5f8246d0db0270817048dc992db66e9fb.tar.gz | |
Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
Diffstat (limited to 'chrome/browser/signin/signin_error_notifier_ash.h')
| -rw-r--r-- | chrome/browser/signin/signin_error_notifier_ash.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/signin/signin_error_notifier_ash.h b/chrome/browser/signin/signin_error_notifier_ash.h index 34819b3e9d..f450c3c3d8 100644 --- a/chrome/browser/signin/signin_error_notifier_ash.h +++ b/chrome/browser/signin/signin_error_notifier_ash.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/strings/string16.h" #include "components/keyed_service/core/keyed_service.h" -#include "components/signin/core/signin_error_controller.h" +#include "components/signin/core/browser/signin_error_controller.h" class Profile; @@ -29,7 +29,6 @@ class SigninErrorNotifier : public SigninErrorController::Observer, virtual void OnErrorChanged() OVERRIDE; private: - base::string16 GetMessageTitle() const; base::string16 GetMessageBody() const; // The error controller to query for error details. |