Commit ccd092e8 authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Adopt chromeos::TabletState in immersive_mode_controller_ash.cc

No behavior change expected.

The CL also removes a trailing include to
chrome/.../ash/tablet_mode_page_behavior.h

BUG=1113900
R=jamescook@chromium.org, sky@chromium.org

Change-Id: I1fe091dbe400afe974fb0f7da90263a2c4cd4f00
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2472203
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818079}
parent 5a7ae53c
......@@ -4,15 +4,14 @@
#include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
#include "ash/public/cpp/tablet_mode.h"
#include "ash/public/cpp/window_properties.h"
#include "base/macros.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/ui/ash/tablet_mode_page_behavior.h"
#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.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 "chromeos/ui/base/tablet_state.h"
#include "chromeos/ui/base/window_properties.h"
#include "chromeos/ui/frame/immersive/immersive_revealed_lock.h"
#include "content/public/browser/web_contents.h"
......@@ -125,7 +124,7 @@ void ImmersiveModeControllerAsh::OnFindBarVisibleBoundsChanged(
bool ImmersiveModeControllerAsh::ShouldStayImmersiveAfterExitingFullscreen() {
return !browser_view_->CanSupportTabStrip() &&
ash::TabletMode::Get()->InTabletMode();
chromeos::TabletState::Get()->InTabletMode();
}
void ImmersiveModeControllerAsh::OnWidgetActivationChanged(
......@@ -134,7 +133,7 @@ void ImmersiveModeControllerAsh::OnWidgetActivationChanged(
if (browser_view_->CanSupportTabStrip())
return;
if (!ash::TabletMode::Get()->InTabletMode())
if (!chromeos::TabletState::Get()->InTabletMode())
return;
// Don't use immersive mode as long as we are in the locked fullscreen mode
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment