summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-09 22:28:19 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-09 22:28:19 +0000
commitdc9abbb838f1d734d1ced5f82d43fe3481f41fc6 (patch)
tree9081bf7720ecb787028703ca75e22b74d9afa164
parentb4caa381880a06481ec8069cd1fd1c094c72a26e (diff)
downloadchromium_src-dc9abbb838f1d734d1ced5f82d43fe3481f41fc6.zip
chromium_src-dc9abbb838f1d734d1ced5f82d43fe3481f41fc6.tar.gz
chromium_src-dc9abbb838f1d734d1ced5f82d43fe3481f41fc6.tar.bz2
sync: fix tiny bug with NotificationServiceSessionsRouter
On Chrome os managed mode, if we get a blocked navigation before session sync is set up we can't do anything with it. BUG=98892 Review URL: https://codereview.chromium.org/132263003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244001 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/sync/sessions2/notification_service_sessions_router.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/sessions2/notification_service_sessions_router.cc b/chrome/browser/sync/sessions2/notification_service_sessions_router.cc
index 0845890..7c96c64 100644
--- a/chrome/browser/sync/sessions2/notification_service_sessions_router.cc
+++ b/chrome/browser/sync/sessions2/notification_service_sessions_router.cc
@@ -135,7 +135,7 @@ void NotificationServiceSessionsRouter::OnNavigationBlocked(
content::WebContents* web_contents) {
SyncedTabDelegate* tab =
SyncedTabDelegate::ImplFromWebContents(web_contents);
- if (!tab)
+ if (!tab || !handler_)
return;
DCHECK(tab->profile() == profile_);