Commit 46a80d36 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Revert "Fix Autohide -> None frame traisntion"

This reverts commit d8e75830.

Reason for revert: Makes https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/linux-chromeos-dbg fail exo_unittests:

ClientControlledShellSurfaceTest.CompositorLockInRotation
ClientControlledShellSurfaceTest.SnapWindowInSplitViewModeTest


Original change's description:
> Fix Autohide -> None frame traisntion
> 
> The transition didn't work correctly but no one was using
> this transition except pinned mode. This is actually odd
> transition, but this should work regardless.
> 
> I will look into why pinned mode does this separately.
> 
> Bug: b/112240082
> Test: covered by unittests
> Change-Id: I88db9dfb614895f19951fd822185460bf682948a
> Reviewed-on: https://chromium-review.googlesource.com/1164570
> Reviewed-by: Daichi Hirono <hirono@chromium.org>
> Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#581104}

TBR=oshima@chromium.org,hirono@chromium.org

Change-Id: If88141880f6a41a142faa1a6a95da54c78b1791e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b/112240082
Reviewed-on: https://chromium-review.googlesource.com/1165442Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581226}
parent b4ad205f
...@@ -250,8 +250,7 @@ void HeaderView::OnTabletModeStarted() { ...@@ -250,8 +250,7 @@ void HeaderView::OnTabletModeStarted() {
void HeaderView::OnTabletModeEnded() { void HeaderView::OnTabletModeEnded() {
caption_button_container_->UpdateCaptionButtonState(true /*=animate*/); caption_button_container_->UpdateCaptionButtonState(true /*=animate*/);
parent()->Layout(); parent()->Layout();
if (target_widget_->non_client_view()) target_widget_->non_client_view()->Layout();
target_widget_->non_client_view()->Layout();
} }
void HeaderView::OnWindowPropertyChanged(aura::Window* window, void HeaderView::OnWindowPropertyChanged(aura::Window* window,
......
...@@ -907,9 +907,8 @@ gfx::Point ClientControlledShellSurface::GetSurfaceOrigin() const { ...@@ -907,9 +907,8 @@ gfx::Point ClientControlledShellSurface::GetSurfaceOrigin() const {
// ClientControlledShellSurface, private: // ClientControlledShellSurface, private:
void ClientControlledShellSurface::UpdateFrame() { void ClientControlledShellSurface::UpdateFrame() {
if (!widget_) if (!widget_ || !GetFrameView()->visible())
return; return;
gfx::Rect work_area = gfx::Rect work_area =
display::Screen::GetScreen() display::Screen::GetScreen()
->GetDisplayNearestWindow(widget_->GetNativeWindow()) ->GetDisplayNearestWindow(widget_->GetNativeWindow())
......
...@@ -555,18 +555,6 @@ TEST_F(ClientControlledShellSurfaceTest, Frame) { ...@@ -555,18 +555,6 @@ TEST_F(ClientControlledShellSurfaceTest, Frame) {
EXPECT_EQ(client_bounds, widget->GetWindowBoundsInScreen()); EXPECT_EQ(client_bounds, widget->GetWindowBoundsInScreen());
EXPECT_EQ(client_bounds, EXPECT_EQ(client_bounds,
frame_view->GetClientBoundsForWindowBounds(client_bounds)); frame_view->GetClientBoundsForWindowBounds(client_bounds));
// Test NONE -> AUTOHIDE -> NONE
shell_surface->SetMaximized();
shell_surface->SetGeometry(fullscreen_bounds);
surface->SetFrame(SurfaceFrameType::AUTOHIDE);
surface->Commit();
EXPECT_TRUE(frame_view->visible());
EXPECT_TRUE(frame_view->GetHeaderView()->in_immersive_mode());
surface->SetFrame(SurfaceFrameType::NONE);
surface->Commit();
EXPECT_FALSE(frame_view->visible());
EXPECT_FALSE(frame_view->GetHeaderView()->in_immersive_mode());
} }
namespace { namespace {
...@@ -1495,22 +1483,12 @@ TEST_F(ClientControlledShellSurfaceTest, WideFrame) { ...@@ -1495,22 +1483,12 @@ TEST_F(ClientControlledShellSurfaceTest, WideFrame) {
ASSERT_TRUE(wide_frame); ASSERT_TRUE(wide_frame);
EXPECT_FALSE(wide_frame->header_view()->in_immersive_mode()); EXPECT_FALSE(wide_frame->header_view()->in_immersive_mode());
// Test AUTOHIDE -> NORMAL // Set AutoHide mode.
surface->SetFrame(SurfaceFrameType::AUTOHIDE); surface->SetFrame(SurfaceFrameType::AUTOHIDE);
surface->Commit();
EXPECT_TRUE(wide_frame->header_view()->in_immersive_mode()); EXPECT_TRUE(wide_frame->header_view()->in_immersive_mode());
// Exit AutoHide mode.
surface->SetFrame(SurfaceFrameType::NORMAL); surface->SetFrame(SurfaceFrameType::NORMAL);
surface->Commit();
EXPECT_FALSE(wide_frame->header_view()->in_immersive_mode());
// Test AUTOHIDE -> NONE
surface->SetFrame(SurfaceFrameType::AUTOHIDE);
surface->Commit();
EXPECT_TRUE(wide_frame->header_view()->in_immersive_mode());
surface->SetFrame(SurfaceFrameType::NONE);
surface->Commit();
EXPECT_FALSE(wide_frame->header_view()->in_immersive_mode()); EXPECT_FALSE(wide_frame->header_view()->in_immersive_mode());
// Unmaximize it and the frame should be normal. // Unmaximize it and the frame should be normal.
......
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