Commit e6c14217 authored by mukai@chromium.org's avatar mukai@chromium.org

Add user_info_ NULL check in case of guest mode.

BUG=128514
TEST=manually

Review URL: https://chromiumcodereview.appspot.com/10389193

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137723 0039d316-1c4b-4281-b951-d872f2087c98
parent 08eccdd8
...@@ -224,7 +224,7 @@ class UserView : public views::View, ...@@ -224,7 +224,7 @@ class UserView : public views::View,
return; return;
container_->SetBoundsRect(gfx::Rect(size())); container_->SetBoundsRect(gfx::Rect(size()));
if (signout_) { if (signout_ && user_info_) {
gfx::Rect signout_bounds(signout_->GetPreferredSize()); gfx::Rect signout_bounds(signout_->GetPreferredSize());
signout_bounds = bounds().Center(signout_bounds.size()); signout_bounds = bounds().Center(signout_bounds.size());
signout_bounds.set_x(width() - signout_bounds.width() - signout_bounds.set_x(width() - signout_bounds.width() -
...@@ -234,7 +234,9 @@ class UserView : public views::View, ...@@ -234,7 +234,9 @@ class UserView : public views::View,
gfx::Rect usercard_bounds(user_info_->GetPreferredSize()); gfx::Rect usercard_bounds(user_info_->GetPreferredSize());
usercard_bounds.set_width(signout_bounds.x()); usercard_bounds.set_width(signout_bounds.x());
user_info_->SetBoundsRect(usercard_bounds); user_info_->SetBoundsRect(usercard_bounds);
} else { } else if (signout_) {
signout_->SetBoundsRect(gfx::Rect(size()));
} else if (user_info_) {
user_info_->SetBoundsRect(gfx::Rect(size())); user_info_->SetBoundsRect(gfx::Rect(size()));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment