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

Unified Diff: ash/system/user/tray_user.cc

Issue 10389193: Add user_info_ NULL check in case of guest mode. (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/user/tray_user.cc
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index f431980d03a8b6b23ff2342fdd4329d7aff8e58a..c569a7538c606c84d26188f190395836ced20007 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -231,10 +231,12 @@ class UserView : public views::View,
kTrayPopupPaddingHorizontal);
signout_->SetBoundsRect(signout_bounds);
- gfx::Rect usercard_bounds(user_info_->GetPreferredSize());
- usercard_bounds.set_width(signout_bounds.x());
- user_info_->SetBoundsRect(usercard_bounds);
- } else {
+ if (user_info_) {
+ gfx::Rect usercard_bounds(user_info_->GetPreferredSize());
+ usercard_bounds.set_width(signout_bounds.x());
+ user_info_->SetBoundsRect(usercard_bounds);
+ }
sadrul 2012/05/17 17:07:32 I think what this will do is we will end up with e
Jun Mukai 2012/05/17 20:13:36 Done.
+ } else if (user_info_) {
user_info_->SetBoundsRect(gfx::Rect(size()));
}
}
« 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