ash/frame/custom_frame_view_ash.cc - Issue 802473003: Fix references to ui/gfx headers in a*/.

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

Issue 802473003: Fix references to ui/gfx headers in a*/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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.cc ('k') | ash/frame/custom_frame_view_ash_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/frame_util.h"	14 #include "ash/frame/frame_util.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

28 #include "ui/gfx/image/image.h"	31 #include "ui/gfx/image/image.h"

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

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

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

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

33 #include "ui/views/view.h"	33 #include "ui/views/view.h"

34 #include "ui/views/view_targeter.h"	34 #include "ui/views/view_targeter.h"

35 #include "ui/views/widget/widget.h"	35 #include "ui/views/widget/widget.h"

36 #include "ui/views/widget/widget_delegate.h"	36 #include "ui/views/widget/widget_delegate.h"

37	37

38 namespace {	38 namespace {

39	39

40 ///////////////////////////////////////////////////////////////////////////////	40 ///////////////////////////////////////////////////////////////////////////////

41 // CustomFrameViewAshWindowStateDelegate	41 // CustomFrameViewAshWindowStateDelegate

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

585 GetFrameCaptionButtonContainerViewForTest() {	585 GetFrameCaptionButtonContainerViewForTest() {

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

587 }	587 }

588	588

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

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

591 }	591 }

592	592

593 } // namespace ash	593 } // namespace ash

OLD	NEW