diff options
| author | michaelpg@chromium.org <michaelpg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 16:25:51 +0000 |
|---|---|---|
| committer | michaelpg@chromium.org <michaelpg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 16:25:51 +0000 |
| commit | 8e37b2cd5b2cab800f48c8546113c284c57ca0b1 (patch) | |
| tree | da93341dd643a4299f11218490d20739d3c086b4 /chrome/browser/extensions | |
| parent | ac685c4c6758e105d86f17267317012f12628577 (diff) | |
| download | chromium_src-8e37b2cd5b2cab800f48c8546113c284c57ca0b1.zip chromium_src-8e37b2cd5b2cab800f48c8546113c284c57ca0b1.tar.gz chromium_src-8e37b2cd5b2cab800f48c8546113c284c57ca0b1.tar.bz2 | |
SyncGlobalError refactor and Ash notification.
Same deal as issue 172853009:
Auth errors currently show up in the wrench menu as GlobalErrors. This CL
removes auth errors from the wrench menu in Chrome OS and in Windows when
using the Ash shell, showing notifications instead.
The behavior when clicking these notifications should be the same as
when clicking the toolbar menu error -- showing the sync setup dialog in
the Settings page.
The error-checking logic has been refactored into the new SyncErrorController,
which now exposes the error status to the UI classes.
The UI classes, SyncGlobalError and SyncErrorNotifier, are keyed services
instantiated by the UI.
BUG=128948
TEST=unit_tests --gtest_filter=S*n*Error*
R=stevenjb@chromium.org, atwilson@chromium.org, derat@chromium.org, ben@chromium.org
Review URL: https://codereview.chromium.org/207603002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260154 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/sessions/sessions_apitest.cc | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc index e521c3f..65d1ed7 100644 --- a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc +++ b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc @@ -122,12 +122,13 @@ class PreferencesPrivateApiTest : public ExtensionApiTest { ProfileManager* profile_manager = g_browser_process->profile_manager(); profile_manager->RegisterTestingProfile(profile, true, false); - browser_ = new Browser(Browser::CreateParams( - profile, chrome::HOST_DESKTOP_TYPE_NATIVE)); service_ = static_cast<FakeProfileSyncService*>( ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse( profile, &FakeProfileSyncService::BuildFakeProfileSyncService)); + + browser_ = new Browser(Browser::CreateParams( + profile, chrome::HOST_DESKTOP_TYPE_NATIVE)); } // Calls GetSyncCategoriesWithoutPassphraseFunction and verifies that the diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc index 2c90aa9..398659d 100644 --- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc +++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc @@ -111,11 +111,11 @@ void ExtensionSessionsTest::CreateTestProfileSyncService() { Profile* profile = Profile::CreateProfile(path, NULL, Profile::CREATE_MODE_SYNCHRONOUS); profile_manager->RegisterTestingProfile(profile, true, false); - browser_ = new Browser(Browser::CreateParams( - profile, chrome::HOST_DESKTOP_TYPE_NATIVE)); ProfileSyncServiceMock* service = static_cast<ProfileSyncServiceMock*>( ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse( profile, &ProfileSyncServiceMock::BuildMockProfileSyncService)); + browser_ = new Browser(Browser::CreateParams( + profile, chrome::HOST_DESKTOP_TYPE_NATIVE)); if (CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableSyncSessionsV2)) { |