Commit 6e22a39a authored by Daniel Nicoara's avatar Daniel Nicoara Committed by Commit Bot

exo: ifdef(OS_CHROMEOS) around Ash related window properties

BUG=None
TEST=Compiled cast_shell with debug (release optimizes out utility
functions).

Change-Id: If0ab660ac716366e4278abc35582fee31f61328c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2314659Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Commit-Queue: Daniel Nicoara <dnicoara@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791243}
parent b3a8ab87
......@@ -7,7 +7,6 @@
#include <memory>
#include "ash/public/cpp/app_types.h"
#include "ash/public/cpp/window_properties.h"
#include "base/strings/string_number_conversions.h"
#include "base/trace_event/trace_event.h"
#include "components/exo/permission.h"
......@@ -23,6 +22,10 @@
#include "ui/views/widget/widget.h"
#include "ui/wm/core/window_util.h"
#if defined(OS_CHROMEOS)
#include "ash/public/cpp/window_properties.h"
#endif // defined(OS_CHROMEOS)
DEFINE_UI_CLASS_PROPERTY_TYPE(exo::Permission*)
namespace exo {
......@@ -107,11 +110,13 @@ const std::string* GetShellStartupId(aura::Window* window) {
}
void SetShellUseImmersiveForFullscreen(aura::Window* window, bool value) {
#if defined(OS_CHROMEOS)
window->SetProperty(ash::kImmersiveImpliedByFullscreen, value);
// Ensure the shelf is fully hidden in plain fullscreen, but shown
// (auto-hides based on mouse movement) when in immersive fullscreen.
window->SetProperty(ash::kHideShelfWhenFullscreenKey, !value);
#endif // defined(OS_CHROMEOS)
}
void SetShellClientAccessibilityId(aura::Window* window,
......
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