| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" | 5 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" |
| 6 | 6 |
| 7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
| 8 #include "ash/common/wm/window_state.h" | 8 #include "ash/common/wm/window_state.h" |
| 9 #include "ash/shared/immersive_revealed_lock.h" | 9 #include "ash/shared/immersive_revealed_lock.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 for (Observer& observer : observers_) | 267 for (Observer& observer : observers_) |
| 268 observer.OnImmersiveRevealStarted(); | 268 observer.OnImmersiveRevealStarted(); |
| 269 } | 269 } |
| 270 | 270 |
| 271 void ImmersiveModeControllerAsh::OnImmersiveRevealEnded() { | 271 void ImmersiveModeControllerAsh::OnImmersiveRevealEnded() { |
| 272 DestroyMashRevealWidget(); | 272 DestroyMashRevealWidget(); |
| 273 visible_fraction_ = 0; | 273 visible_fraction_ = 0; |
| 274 browser_view_->top_container()->DestroyLayer(); | 274 browser_view_->top_container()->DestroyLayer(); |
| 275 UpdateTabIndicators(); | 275 UpdateTabIndicators(); |
| 276 LayoutBrowserRootView(); | 276 LayoutBrowserRootView(); |
| 277 for (Observer& observer : observers_) |
| 278 observer.OnImmersiveRevealEnded(); |
| 277 } | 279 } |
| 278 | 280 |
| 279 void ImmersiveModeControllerAsh::OnImmersiveFullscreenExited() { | 281 void ImmersiveModeControllerAsh::OnImmersiveFullscreenExited() { |
| 280 DestroyMashRevealWidget(); | 282 DestroyMashRevealWidget(); |
| 281 browser_view_->top_container()->DestroyLayer(); | 283 browser_view_->top_container()->DestroyLayer(); |
| 282 UpdateTabIndicators(); | 284 UpdateTabIndicators(); |
| 283 LayoutBrowserRootView(); | 285 LayoutBrowserRootView(); |
| 284 } | 286 } |
| 285 | 287 |
| 286 void ImmersiveModeControllerAsh::SetVisibleFraction(double visible_fraction) { | 288 void ImmersiveModeControllerAsh::SetVisibleFraction(double visible_fraction) { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 // the shelf completely and prevent it from being revealed. | 352 // the shelf completely and prevent it from being revealed. |
| 351 bool in_tab_fullscreen = content::Source<FullscreenController>(source)-> | 353 bool in_tab_fullscreen = content::Source<FullscreenController>(source)-> |
| 352 IsWindowFullscreenForTabOrPending(); | 354 IsWindowFullscreenForTabOrPending(); |
| 353 ash::wm::GetWindowState(native_window_) | 355 ash::wm::GetWindowState(native_window_) |
| 354 ->set_hide_shelf_when_fullscreen(in_tab_fullscreen); | 356 ->set_hide_shelf_when_fullscreen(in_tab_fullscreen); |
| 355 ash::Shell::GetInstance()->UpdateShelfVisibility(); | 357 ash::Shell::GetInstance()->UpdateShelfVisibility(); |
| 356 | 358 |
| 357 if (tab_indicator_visibility_changed) | 359 if (tab_indicator_visibility_changed) |
| 358 LayoutBrowserRootView(); | 360 LayoutBrowserRootView(); |
| 359 } | 361 } |
| OLD | NEW |