diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 10:15:27 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 10:15:27 +0000 |
| commit | 85501febd4ae0dff68c845b9b27c1058b1276385 (patch) | |
| tree | e80cb79057d886b4f97f709cea5bed0f0f446909 /ash/wm/workspace | |
| parent | 72779c9d9d4099c50f47b909fdecad169682dd90 (diff) | |
| download | chromium_src-85501febd4ae0dff68c845b9b27c1058b1276385.zip chromium_src-85501febd4ae0dff68c845b9b27c1058b1276385.tar.gz chromium_src-85501febd4ae0dff68c845b9b27c1058b1276385.tar.bz2 | |
Refactor FramePainter so that a child view of NonClientFrameView can paint the header instead of NonClientFrameView. This functionality is necessary so that CustomFrameViewAsh can be put into immersive fullscreen.
BUG=307622
TEST=ResizeShadowAndCursorTest.*
R=jamescook
TBR=sky (For trivial refactor as a result of merging CustomFrameViewAsh::Init() and the CustomFrameViewAsh constructor)
Review URL: https://codereview.chromium.org/27267003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace')
| -rw-r--r-- | ash/wm/workspace/workspace_layout_manager.cc | 4 | ||||
| -rw-r--r-- | ash/wm/workspace/workspace_window_resizer_unittest.cc | 13 |
2 files changed, 6 insertions, 11 deletions
diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc index 5185b63..a33f680 100644 --- a/ash/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc @@ -11,7 +11,7 @@ #include "ash/shell.h" #include "ash/wm/always_on_top_controller.h" #include "ash/wm/base_layout_manager.h" -#include "ash/wm/frame_painter.h" +#include "ash/wm/header_painter.h" #include "ash/wm/window_animations.h" #include "ash/wm/window_positioner.h" #include "ash/wm/window_properties.h" @@ -278,7 +278,7 @@ void WorkspaceLayoutManager::AdjustWindowBoundsWhenAdded( void WorkspaceLayoutManager::UpdateDesktopVisibility() { if (shelf_) shelf_->UpdateVisibilityState(); - FramePainter::UpdateSoloWindowHeader(window_->GetRootWindow()); + HeaderPainter::UpdateSoloWindowHeader(window_->GetRootWindow()); } void WorkspaceLayoutManager::UpdateBoundsFromShowState( diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc index eb17ebd..9d6969b 100644 --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc @@ -190,19 +190,14 @@ class WorkspaceWindowResizerTest : public test::AshTestBase { touch_resize_window_.reset( CreateTestWindowInShellWithDelegate(&touch_resize_delegate_, 0, bounds)); - gfx::Insets mouse_outer_insets = gfx::Insets(-ash::kResizeOutsideBoundsSize, - -ash::kResizeOutsideBoundsSize, - -ash::kResizeOutsideBoundsSize, - -ash::kResizeOutsideBoundsSize); + gfx::Insets mouse_outer_insets(-ash::kResizeOutsideBoundsSize, + -ash::kResizeOutsideBoundsSize, + -ash::kResizeOutsideBoundsSize, + -ash::kResizeOutsideBoundsSize); gfx::Insets touch_outer_insets = mouse_outer_insets.Scale( ash::kResizeOutsideBoundsScaleForTouch); touch_resize_window_->SetHitTestBoundsOverrideOuter(mouse_outer_insets, touch_outer_insets); - touch_resize_window_->set_hit_test_bounds_override_inner( - gfx::Insets(ash::kResizeInsideBoundsSize, - ash::kResizeInsideBoundsSize, - ash::kResizeInsideBoundsSize, - ash::kResizeInsideBoundsSize)); } // Simulate running the animation. |