Refactor fullscreen_controller.

chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
 
 #include "ash/shell.h"
 #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_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"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/aura/window.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
@@ skipping 110 matching lines @@
 
 void ImmersiveModeControllerAsh::SetupForTest() {
   controller_->SetupForTest();
 }
 
 void ImmersiveModeControllerAsh::EnableWindowObservers(bool enable) {
   if (observers_enabled_ == enable)
     return;
   observers_enabled_ = enable;
 
-  content::Source<FullscreenController> source(
-      browser_view_->browser()->fullscreen_controller());
+  content::Source<FullscreenController> source(browser_view_->browser()
+                                                   ->exclusive_access_manager()
+                                                   ->fullscreen_controller());
   if (enable) {
     ash::wm::GetWindowState(native_window_)->AddObserver(this);
     registrar_.Add(this, chrome::NOTIFICATION_FULLSCREEN_CHANGED, source);
   } else {
     ash::wm::GetWindowState(native_window_)->RemoveObserver(this);
     registrar_.Remove(this, chrome::NOTIFICATION_FULLSCREEN_CHANGED, source);
   }
 }
 
 void ImmersiveModeControllerAsh::LayoutBrowserRootView() {
   views::Widget* widget = browser_view_->frame();
   // Update the window caption buttons.
   widget->non_client_view()->frame_view()->ResetWindowControls();
   widget->non_client_view()->frame_view()->InvalidateLayout();
   browser_view_->InvalidateLayout();
   widget->GetRootView()->Layout();
 }
 
 bool ImmersiveModeControllerAsh::UpdateTabIndicators() {
   bool has_tabstrip = browser_view_->IsBrowserTypeNormal();
   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()
+                                 ->exclusive_access_manager()
+                                 ->fullscreen_controller()
+                                 ->IsWindowFullscreenForTabOrPending();
     use_tab_indicators_ = !in_tab_fullscreen;
   }
 
   bool show_tab_indicators = use_tab_indicators_ && !IsRevealed();
   if (show_tab_indicators != browser_view_->tabstrip()->IsImmersiveStyle()) {
     browser_view_->tabstrip()->SetImmersiveStyle(show_tab_indicators);
     return true;
   }
   return false;
 }
@@ skipping 75 matching lines @@
   // prevent it from being revealed.
   bool in_tab_fullscreen = content::Source<FullscreenController>(source)->
       IsWindowFullscreenForTabOrPending();
   ash::wm::GetWindowState(native_window_)->set_hide_shelf_when_fullscreen(
       in_tab_fullscreen);
   ash::Shell::GetInstance()->UpdateShelfVisibility();
 
   if (tab_indicator_visibility_changed)
     LayoutBrowserRootView();
 }