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 de79e613486089da026d273c047cd5ec4a4b2a4f..da1ffb81d8ad36a761829bdb092fc956bd8567a5 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 |
| @@ -355,13 +355,21 @@ void BrowserNonClientFrameViewAsh::ChildPreferredSizeChanged( |
| // ash::ShellObserver: |
| void BrowserNonClientFrameViewAsh::OnOverviewModeStarting() { |
|
tdanderson
2016/07/08 18:51:55
As a side question, why aren't we making any MD ch
varkha
2016/07/08 19:27:41
Good question, I will follow up with sky if it is
|
| - if (ash::MaterialDesignController::IsOverviewMaterial()) |
| + if (!ash::MaterialDesignController::IsOverviewMaterial()) |
| + return; |
| + if (browser_view()->IsTabStripVisible()) |
| caption_button_container_->SetVisible(false); |
| + else |
| + SetVisible(false); |
|
tdanderson
2016/07/08 18:51:55
Correct me if I'm mistaken, but isn't this setting
varkha
2016/07/08 19:27:41
For ash browser frame this is the only visible por
|
| } |
| void BrowserNonClientFrameViewAsh::OnOverviewModeEnded() { |
| - if (ash::MaterialDesignController::IsOverviewMaterial()) |
| + if (!ash::MaterialDesignController::IsOverviewMaterial()) |
| + return; |
| + if (browser_view()->IsTabStripVisible()) |
| caption_button_container_->SetVisible(true); |
| + else |
| + SetVisible(true); |
| } |
| void BrowserNonClientFrameViewAsh::OnMaximizeModeStarted() { |