diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 17:22:45 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 17:22:45 +0000 |
| commit | c8a61d09266f97873a2ece1657ebd655edfb599f (patch) | |
| tree | bcb4eaa270ab425fd0fc9b902923ae0b7e5ac7d5 /chrome/browser/extensions | |
| parent | b635b728109908e7d458c07d0b937b6b9afad9fe (diff) | |
| download | chromium_src-c8a61d09266f97873a2ece1657ebd655edfb599f.zip chromium_src-c8a61d09266f97873a2ece1657ebd655edfb599f.tar.gz chromium_src-c8a61d09266f97873a2ece1657ebd655edfb599f.tar.bz2 | |
Removed SyncSetupFlow and SyncSetupWizard.
Move logic in SyncSetupFlow and SyncSetupWizard into the UI (SyncSetupHandler)
and into ProfileSyncService itself.
Removed obsolete UI, logic, and strings that are no longer necessary.
BUG=92265,95269
TEST=Run all of the signin/config test cases.
Review URL: https://chromiumcodereview.appspot.com/9716023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/app_notify_channel_ui.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/extensions/app_notify_channel_ui.cc b/chrome/browser/extensions/app_notify_channel_ui.cc index cf810ca..e561bcb 100644 --- a/chrome/browser/extensions/app_notify_channel_ui.cc +++ b/chrome/browser/extensions/app_notify_channel_ui.cc @@ -9,7 +9,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" -#include "chrome/browser/sync/sync_setup_wizard.h" #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" @@ -129,7 +128,10 @@ void AppNotifyChannelUIImpl::OnStateChanged() { ProfileSyncService* sync_service = ProfileSyncServiceFactory::GetInstance()->GetForProfile( browser_->profile()->GetOriginalProfile()); - bool wizard_visible = sync_service->WizardIsVisible(); + LoginUIService* login_service = LoginUIServiceFactory::GetForProfile( + browser_->profile()->GetOriginalProfile()); + + bool wizard_visible = (login_service->current_login_ui() != NULL); // ProfileSyncService raises OnStateChanged many times. Even multiple // times before the wizard actually becomes visible for the first time. // So we have to wait for the wizard to become visible once and then we |