Commit 765c9514 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

chromeos: removes AshWindowTreeHost::ToggleFullscreen

None of the implementations do anything, so no point in keeping it
around.

BUG=none
TEST=none

Change-Id: Ic892b01b1f4896105982e2646731d65d53499c54
Reviewed-on: https://chromium-review.googlesource.com/576662
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487930}
parent 1a346ab7
......@@ -124,7 +124,6 @@ bool AcceleratorControllerDelegateAura::HandlesAction(
case DEBUG_TOGGLE_SHOW_FPS_COUNTER:
case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
case DEV_ADD_REMOVE_DISPLAY:
case DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
case LOCK_PRESSED:
case LOCK_RELEASED:
case MAGNIFY_SCREEN_ZOOM_IN:
......@@ -157,8 +156,6 @@ bool AcceleratorControllerDelegateAura::CanPerformAction(
case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
return debug::DebugAcceleratorsEnabled();
case DEV_ADD_REMOVE_DISPLAY:
case DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
return debug::DeveloperAcceleratorsEnabled();
case MAGNIFY_SCREEN_ZOOM_IN:
case MAGNIFY_SCREEN_ZOOM_OUT:
return CanHandleMagnifyScreen();
......@@ -203,9 +200,6 @@ void AcceleratorControllerDelegateAura::PerformAction(
case DEV_ADD_REMOVE_DISPLAY:
Shell::Get()->display_manager()->AddRemoveDisplay();
break;
case DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
Shell::GetPrimaryRootWindowController()->ash_host()->ToggleFullScreen();
break;
case LOCK_PRESSED:
case LOCK_RELEASED:
Shell::Get()->power_button_controller()->OnLockButtonEvent(
......
......@@ -286,8 +286,6 @@ const AcceleratorData kDeveloperAcceleratorData[] = {
{true, ui::VKEY_R, kDebugModifier, ROTATE_SCREEN},
// For testing on systems where Alt-Tab is already mapped.
{true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU},
{true, ui::VKEY_F11, ui::EF_CONTROL_DOWN,
DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN},
{true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU},
{true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
TOGGLE_FULLSCREEN},
......
......@@ -70,7 +70,6 @@ enum AcceleratorAction {
DEBUG_TOGGLE_WALLPAPER_MODE,
DEBUG_TRIGGER_CRASH, // Intentionally crash the ash process.
DEV_ADD_REMOVE_DISPLAY,
DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN,
DEV_TOGGLE_UNIFIED_DESKTOP,
DISABLE_CAPS_LOCK,
EXIT,
......
......@@ -17,10 +17,10 @@ namespace {
// The number of non-Search-based accelerators as of 2017-07-13.
constexpr int kNonSearchAcceleratorsNum = 94;
// The hash of non-Search-based accelerators as of 2017-07-13.
// The hash of non-Search-based accelerators as of 2017-07-19.
// See HashAcceleratorData().
constexpr char kNonSearchAcceleratorsHash[] =
"6f56544cda78a99f30ea597ec131bc56";
"8c68836ced2c7874a8ff8e306005d526";
struct Cmp {
bool operator()(const AcceleratorData& lhs, const AcceleratorData& rhs) {
......
......@@ -34,9 +34,6 @@ class ASH_EXPORT AshWindowTreeHost {
static std::unique_ptr<AshWindowTreeHost> Create(
const AshWindowTreeHostInitParams& init_params);
// Toggles the host's full screen state.
virtual void ToggleFullScreen() = 0;
// Clips the cursor to the bounds of the root window until UnConfineCursor().
// We would like to be able to confine the cursor to that window. However,
// currently, we do not have such functionality in X. So we just confine
......
......@@ -41,10 +41,6 @@ AshWindowTreeHostPlatform::AshWindowTreeHostPlatform()
AshWindowTreeHostPlatform::~AshWindowTreeHostPlatform() {}
void AshWindowTreeHostPlatform::ToggleFullScreen() {
NOTIMPLEMENTED();
}
bool AshWindowTreeHostPlatform::ConfineCursorToRootWindow() {
gfx::Rect confined_bounds(GetBoundsInPixels().size());
confined_bounds.Inset(transformer_helper_.GetHostInsets());
......
......@@ -25,7 +25,6 @@ class ASH_EXPORT AshWindowTreeHostPlatform
AshWindowTreeHostPlatform();
// AshWindowTreeHost:
void ToggleFullScreen() override;
bool ConfineCursorToRootWindow() override;
void UnConfineCursor() override;
void SetRootWindowTransformer(
......
......@@ -45,10 +45,6 @@ AshWindowTreeHostX11::~AshWindowTreeHostX11() {
UnConfineCursor();
}
void AshWindowTreeHostX11::ToggleFullScreen() {
NOTIMPLEMENTED();
}
bool AshWindowTreeHostX11::ConfineCursorToRootWindow() {
#if XFIXES_MAJOR >= 5
DCHECK(!pointer_barriers_.get());
......
......@@ -26,7 +26,6 @@ class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost,
private:
// AshWindowTreeHost:
void ToggleFullScreen() override;
bool ConfineCursorToRootWindow() override;
void UnConfineCursor() override;
void SetRootWindowTransformer(
......
......@@ -34,7 +34,6 @@ bool AcceleratorControllerDelegateMus::HandlesAction(AcceleratorAction action) {
case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS:
case DEBUG_TOGGLE_SHOW_FPS_COUNTER:
case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
case DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
case LOCK_PRESSED:
case LOCK_RELEASED:
case MAGNIFY_SCREEN_ZOOM_IN:
......
......@@ -29,11 +29,6 @@ AshWindowTreeHostMus::AshWindowTreeHostMus(
AshWindowTreeHostMus::~AshWindowTreeHostMus() {}
void AshWindowTreeHostMus::ToggleFullScreen() {
// TODO: this function should be removed entirely as it's not used.
NOTREACHED();
}
bool AshWindowTreeHostMus::ConfineCursorToRootWindow() {
// TODO: when implementing see implementation in AshWindowTreeHostPlatform
// for how it uses |transformer_helper_|. http://crbug.com/746054.
......
......@@ -20,7 +20,6 @@ class AshWindowTreeHostMus : public AshWindowTreeHost,
~AshWindowTreeHostMus() override;
// AshWindowTreeHost:
void ToggleFullScreen() override;
bool ConfineCursorToRootWindow() override;
void UnConfineCursor() override;
void SetRootWindowTransformer(
......
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