| Index: chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| index 664a4d25e5785bc70a4ab9dfc62a68f1064b7204..2264395f083bc4d9155d9df70178a24c176ec484 100644
|
| --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| @@ -8,6 +8,7 @@
|
| #include "ash/wm/immersive_revealed_lock.h"
|
| #include "ash/wm/window_state.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| +#include "chrome/browser/ui/exclusive_access/exclusive_access_controller_manager.h"
|
| #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
|
| #include "chrome/browser/ui/views/frame/browser_view.h"
|
| #include "chrome/browser/ui/views/frame/top_container_view.h"
|
| @@ -139,7 +140,9 @@ void ImmersiveModeControllerAsh::EnableWindowObservers(bool enable) {
|
| observers_enabled_ = enable;
|
|
|
| content::Source<FullscreenController> source(
|
| - browser_view_->browser()->fullscreen_controller());
|
| + browser_view_->browser()
|
| + ->GetExclusiveAccessControllerManager()
|
| + ->GetFullscreenController());
|
| if (enable) {
|
| ash::wm::GetWindowState(native_window_)->AddObserver(this);
|
| registrar_.Add(this, chrome::NOTIFICATION_FULLSCREEN_CHANGED, source);
|
| @@ -163,8 +166,10 @@ bool ImmersiveModeControllerAsh::UpdateTabIndicators() {
|
| if (!IsEnabled() || !has_tabstrip) {
|
| use_tab_indicators_ = false;
|
| } else {
|
| - bool in_tab_fullscreen = browser_view_->browser()->fullscreen_controller()->
|
| - IsWindowFullscreenForTabOrPending();
|
| + bool in_tab_fullscreen = browser_view_->browser()
|
| + ->GetExclusiveAccessControllerManager()
|
| + ->GetFullscreenController()
|
| + ->IsWindowFullscreenForTabOrPending();
|
| use_tab_indicators_ = !in_tab_fullscreen;
|
| }
|
|
|
|
|