Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3023)

Unified Diff: chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc

Issue 836933005: Refactor fullscreen_controller. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to TOT Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..31fda80852314201fa4529a7402223afbe7612f2 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_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"
@@ -138,8 +139,9 @@ void ImmersiveModeControllerAsh::EnableWindowObservers(bool 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);
@@ -163,8 +165,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()
+ ->exclusive_access_manager()
+ ->fullscreen_controller()
+ ->IsWindowFullscreenForTabOrPending();
use_tab_indicators_ = !in_tab_fullscreen;
}

Powered by Google App Engine
This is Rietveld 408576698