diff options
| author | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 19:10:19 +0000 |
|---|---|---|
| committer | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 19:10:19 +0000 |
| commit | 35653072a19559aa077fe241c36cd509152f7535 (patch) | |
| tree | 8dc2bef7514ad077c5a11dfd9c35f2859b681f3a /ash/system | |
| parent | 6737c579fd8e5b2aa81971e5b7b8ceb7e3eb5c13 (diff) | |
| download | chromium_src-35653072a19559aa077fe241c36cd509152f7535.zip chromium_src-35653072a19559aa077fe241c36cd509152f7535.tar.gz chromium_src-35653072a19559aa077fe241c36cd509152f7535.tar.bz2 | |
Re-home the global MessageCenter to support Ash+Win environments.
In the case where Ash is displayed on Windows, we want a single
message center data structure with multiple UI surfaces for
notifications.
g_browser_process now manages the lifetime of the global Message
Center object, since its lifetime is always longer than Ash::Shell.
This allows us to re-enable the browser tests for message center
on Ash+Win, and stops a crash bug.
BUG=178429
Review URL: https://chromiumcodereview.appspot.com/12375004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186220 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/web_notification/web_notification_tray.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index 998123f..cfc1e1c 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -98,7 +98,7 @@ WebNotificationTray::WebNotificationTray( SetVisible(false); message_center_tray_.reset(new message_center::MessageCenterTray( this, - Shell::GetInstance()->message_center())); + message_center::MessageCenter::Get())); OnMessageCenterTrayChanged(); } |