ash/frame/custom_frame_view_ash.cc - Issue 1921353002: Moves handful of files to ash/wm/common

Side by Side Diff: ash/frame/custom_frame_view_ash.cc

Issue 1921353002: Moves handful of files to ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell_ids

Patch Set: merge to trunk Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « ash/frame/caption_buttons/frame_size_button_unittest.cc ('k') | ash/frame/default_header_painter_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/frame/custom_frame_view_ash.h"	5 #include "ash/frame/custom_frame_view_ash.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <vector>	8 #include <vector>

9	9

10 #include "ash/ash_switches.h"	10 #include "ash/ash_switches.h"

11 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"	11 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"

12 #include "ash/frame/default_header_painter.h"	12 #include "ash/frame/default_header_painter.h"

13 #include "ash/frame/frame_border_hit_test_controller.h"	13 #include "ash/frame/frame_border_hit_test_controller.h"

14 #include "ash/frame/header_painter.h"	14 #include "ash/frame/header_painter.h"

15 #include "ash/session/session_state_delegate.h"	15 #include "ash/session/session_state_delegate.h"

16 #include "ash/shell.h"	16 #include "ash/shell.h"

17 #include "ash/shell_observer.h"	17 #include "ash/shell_observer.h"

18 #include "ash/wm/aura/wm_window_aura.h"	18 #include "ash/wm/aura/wm_window_aura.h"

	19 #include "ash/wm/common/window_state.h"

	20 #include "ash/wm/common/window_state_delegate.h"

	21 #include "ash/wm/common/window_state_observer.h"

19 #include "ash/wm/immersive_fullscreen_controller.h"	22 #include "ash/wm/immersive_fullscreen_controller.h"

20 #include "ash/wm/window_state.h"

21 #include "ash/wm/window_state_aura.h"	23 #include "ash/wm/window_state_aura.h"

22 #include "ash/wm/window_state_delegate.h"

23 #include "ash/wm/window_state_observer.h"

24 #include "base/command_line.h"	24 #include "base/command_line.h"

25 #include "ui/aura/client/aura_constants.h"	25 #include "ui/aura/client/aura_constants.h"

26 #include "ui/aura/window.h"	26 #include "ui/aura/window.h"

27 #include "ui/aura/window_observer.h"	27 #include "ui/aura/window_observer.h"

28 #include "ui/gfx/canvas.h"	28 #include "ui/gfx/canvas.h"

29 #include "ui/gfx/geometry/rect.h"	29 #include "ui/gfx/geometry/rect.h"

30 #include "ui/gfx/geometry/rect_conversions.h"	30 #include "ui/gfx/geometry/rect_conversions.h"

31 #include "ui/gfx/geometry/size.h"	31 #include "ui/gfx/geometry/size.h"

32 #include "ui/gfx/image/image.h"	32 #include "ui/gfx/image/image.h"

33 #include "ui/views/controls/image_view.h"	33 #include "ui/views/controls/image_view.h"

(...skipping 552 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
586 FrameCaptionButtonContainerView* CustomFrameViewAsh::	586 FrameCaptionButtonContainerView* CustomFrameViewAsh::

587 GetFrameCaptionButtonContainerViewForTest() {	587 GetFrameCaptionButtonContainerViewForTest() {

588 return header_view_->caption_button_container();	588 return header_view_->caption_button_container();

589 }	589 }

590	590

591 int CustomFrameViewAsh::NonClientTopBorderHeight() const {	591 int CustomFrameViewAsh::NonClientTopBorderHeight() const {

592 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();	592 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();

593 }	593 }

594	594

595 } // namespace ash	595 } // namespace ash

OLD	NEW