diff options
| author | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 17:57:36 +0000 |
|---|---|---|
| committer | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 17:57:36 +0000 |
| commit | 80771de8ce0c3f13c041cb03853174b95461a151 (patch) | |
| tree | 9eee0dcb32de22cd1351c729186bb2e9ce3315ac | |
| parent | 8093a58b34fb9d08c0bc84ef6e425da5eadfca97 (diff) | |
| download | chromium_src-80771de8ce0c3f13c041cb03853174b95461a151.zip chromium_src-80771de8ce0c3f13c041cb03853174b95461a151.tar.gz chromium_src-80771de8ce0c3f13c041cb03853174b95461a151.tar.bz2 | |
Message Center settings button causes crash when Ash is disabled.
FindProfileNotification only expects valid notification IDs to be passed in,
but the settings button causes it to be called with a notification ID of "".
r=mukai@chromium.org
BUG=174384
Review URL: https://chromiumcodereview.appspot.com/12208097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182755 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/notifications/message_center_notification_manager.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc index 65c9893..1aa4665 100644 --- a/chrome/browser/notifications/message_center_notification_manager.cc +++ b/chrome/browser/notifications/message_center_notification_manager.cc @@ -190,6 +190,12 @@ void MessageCenterNotificationManager::NotificationRemoved( void MessageCenterNotificationManager::ShowSettings( const std::string& notification_id) { + // The per-message-center Settings button passes an empty string. + if (notification_id.empty()) { + NOTIMPLEMENTED(); + return; + } + ProfileNotification* profile_notification = FindProfileNotification(notification_id); Browser* browser = |