ash/frame/custom_frame_view_ash.cc - Issue 2041233004: mash: Move //ash/session to //ash/common/session

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2041233004: mash: Move //ash/session to //ash/common/session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 6 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/desktop_background/desktop_background_view.cc ('k') | ash/media_delegate.h » ('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/aura/wm_window_aura.h"	11 #include "ash/aura/wm_window_aura.h"

	12 #include "ash/common/session/session_state_delegate.h"

12 #include "ash/common/wm/window_state.h"	13 #include "ash/common/wm/window_state.h"

13 #include "ash/common/wm/window_state_delegate.h"	14 #include "ash/common/wm/window_state_delegate.h"

14 #include "ash/common/wm/window_state_observer.h"	15 #include "ash/common/wm/window_state_observer.h"

15 #include "ash/common/wm_lookup.h"	16 #include "ash/common/wm_lookup.h"

16 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"	17 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"

17 #include "ash/frame/default_header_painter.h"	18 #include "ash/frame/default_header_painter.h"

18 #include "ash/frame/frame_border_hit_test_controller.h"	19 #include "ash/frame/frame_border_hit_test_controller.h"

19 #include "ash/frame/header_painter.h"	20 #include "ash/frame/header_painter.h"

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

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

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

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

24 #include "ash/wm/window_state_aura.h"	24 #include "ash/wm/window_state_aura.h"

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

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

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

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

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

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

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

594 GetFrameCaptionButtonContainerViewForTest() {	594 GetFrameCaptionButtonContainerViewForTest() {

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

596 }	596 }

597	597

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

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

600 }	600 }

601	601

602 } // namespace ash	602 } // namespace ash

OLD	NEW