Chromium Code Reviews| Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc |
| diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc |
| index 66ddf169fd1d2e82f3178ed03dc8298352d10006..190ead2ba5eeaaeb5d77cbcaf03204a448ab5fc3 100644 |
| --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc |
| +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc |
| @@ -202,10 +202,17 @@ void BrowserNonClientFrameViewAsh::ResetWindowControls() { |
| // Only show them during a reveal. |
| ImmersiveModeController* controller = |
| browser_view()->immersive_mode_controller(); |
| - bool show_buttons = !controller->enabled() || controller->IsRevealed(); |
| - immersive_button_->SetVisible(show_buttons); |
| - size_button_->SetVisible(show_buttons); |
| - close_button_->SetVisible(show_buttons); |
| + if (controller->enabled()) { |
| + bool revealed = controller->IsRevealed(); |
| + immersive_button_->SetVisible(revealed); |
| + size_button_->SetVisible(revealed); |
| + close_button_->SetVisible(revealed); |
| + } else { |
| + // Only show immersive button for maximized windows. |
| + immersive_button_->SetVisible(frame()->IsMaximized()); |
|
James Cook
2013/01/16 01:00:26
This is the core change, but I thought it was clea
|
| + size_button_->SetVisible(true); |
| + close_button_->SetVisible(true); |
| + } |
| size_button_->SetState(views::CustomButton::STATE_NORMAL); |
| // The close button isn't affected by this constraint. |