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/sync/sync_ui_util.cc | |
| 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/sync/sync_ui_util.cc')
| -rw-r--r-- | chrome/browser/sync/sync_ui_util.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index cf9400f2cb..d84eab8ee4 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -12,7 +12,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "chrome/browser/signin/signin_manager_base.h" #include "chrome/browser/signin/signin_ui_util.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" @@ -23,8 +22,9 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/signin/core/profile_oauth2_token_service.h" -#include "components/signin/core/signin_error_controller.h" +#include "components/signin/core/browser/profile_oauth2_token_service.h" +#include "components/signin/core/browser/signin_error_controller.h" +#include "components/signin/core/browser/signin_manager_base.h" #include "google_apis/gaia/google_service_auth_error.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" @@ -341,8 +341,8 @@ MessageType GetStatusLabelsForNewTabPage(ProfileSyncService* service, service, signin, status_label, link_label); } -void GetStatusLabelsForSyncGlobalError(ProfileSyncService* service, - const SigninManagerBase& signin, +#if !defined(OS_CHROMEOS) +void GetStatusLabelsForSyncGlobalError(const ProfileSyncService* service, base::string16* menu_label, base::string16* bubble_message, base::string16* bubble_accept_label) { @@ -370,6 +370,7 @@ void GetStatusLabelsForSyncGlobalError(ProfileSyncService* service, return; } } +#endif MessageType GetStatus( ProfileSyncService* service, const SigninManagerBase& signin) { |