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

Unified Diff: ash/system/network/tray_network.cc

Issue 10406020: ash: Fix a crash when going back to the main uber-tray popup from the network popup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/network/tray_network.cc
diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc
index a8f9a0a2856488affb9bf736a2aeea6f78b3d98a..6c88fe67eff4766796045faacf83e5dc7e2e29e4 100644
--- a/ash/system/network/tray_network.cc
+++ b/ash/system/network/tray_network.cc
@@ -468,8 +468,10 @@ class NetworkDetailedView : public TrayDetailsView,
// on.
ResetInfoBubble();
- if (sender == footer()->content())
+ if (sender == footer()->content()) {
Shell::GetInstance()->tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
+ return;
+ }
if (login_ == user::LOGGED_IN_LOCKED)
return;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698