diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 07:11:02 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 07:11:02 +0000 |
| commit | 46ec87fb5709d2020ceebcfc2956ec7dfba0ee51 (patch) | |
| tree | 0ea82350657502982a7d6d6c68ec3783bc498a83 /chrome | |
| parent | c4f8fdcd67231e7786b690be805d9f036ed0f324 (diff) | |
| download | chromium_src-46ec87fb5709d2020ceebcfc2956ec7dfba0ee51.zip chromium_src-46ec87fb5709d2020ceebcfc2956ec7dfba0ee51.tar.gz chromium_src-46ec87fb5709d2020ceebcfc2956ec7dfba0ee51.tar.bz2 | |
Fix a crash in incognito mode when clicking the wrench menu.
This was a regression recent sync UI changes. This fixes the regression to match the old incognito mode behavior.
TBR=tim@chromium.org
BUG=25014
TEST=See bug. It doesn't crash anymore.
Review URL: http://codereview.chromium.org/283008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sync/sync_status_ui_helper.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/sync/sync_status_ui_helper.cc b/chrome/browser/sync/sync_status_ui_helper.cc index 2c221cb..b642d3c 100644 --- a/chrome/browser/sync/sync_status_ui_helper.cc +++ b/chrome/browser/sync/sync_status_ui_helper.cc @@ -63,6 +63,10 @@ SyncStatusUIHelper::MessageType SyncStatusUIHelper::GetLabels( std::wstring* link_label) { MessageType result_type(SYNCED); + if (!service) { + return PRE_SYNCED; + } + if (service->HasSyncSetupCompleted()) { ProfileSyncService::Status status(service->QueryDetailedSyncStatus()); AuthErrorState auth_error(service->GetAuthErrorState()); |