Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(472)

Unified Diff: ash/system/status_area_widget.cc

Issue 10825389: Fix accessability for web notification tray. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix asan bug Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/system/status_area_widget_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/status_area_widget.cc
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index 8470d2df96abd962bbadc363ead3e1e0c48bf6f9..246433f31df05d9107cb9739fe681f7582556b04 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -327,8 +327,8 @@ StatusAreaWidget::~StatusAreaWidget() {
}
void StatusAreaWidget::CreateTrayViews(ShellDelegate* shell_delegate) {
- AddWebNotificationTray();
AddSystemTray(shell_delegate);
+ AddWebNotificationTray();
// Initialize() must be called after all trays have been created.
if (system_tray_)
system_tray_->Initialize();
@@ -342,10 +342,10 @@ void StatusAreaWidget::Shutdown() {
// hierarchy. Do not used scoped pointers since we don't want to destroy them
// in the destructor if Shutdown() is not called (e.g. in tests).
system_tray_delegate_.reset();
- delete system_tray_;
system_tray_ = NULL;
- delete web_notification_tray_;
+ delete system_tray_;
web_notification_tray_ = NULL;
+ delete web_notification_tray_;
}
void StatusAreaWidget::AddSystemTray(ShellDelegate* shell_delegate) {
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/system/status_area_widget_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698