trunk/src/ash/frame/custom_frame_view_ash.cc - Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

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: trunk/src/ash/frame/custom_frame_view_ash.cc

Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 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 | Annotate | Revision Log

« no previous file with comments | « trunk/src/ash/desktop_background/desktop_background_view.cc ('k') | trunk/src/ash/frame/frame_util.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 "ash/ash_switches.h"	7 #include "ash/ash_switches.h"

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

9 #include "ash/frame/caption_buttons/frame_maximize_button.h"	9 #include "ash/frame/caption_buttons/frame_maximize_button.h"

10 #include "ash/frame/caption_buttons/frame_maximize_button_observer.h"	10 #include "ash/frame/caption_buttons/frame_maximize_button_observer.h"

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

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

13 #include "ash/frame/frame_util.h"	13 #include "ash/frame/frame_util.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_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/immersive_fullscreen_controller.h"	18 #include "ash/wm/immersive_fullscreen_controller.h"

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

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

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

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

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

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

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

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

575 GetFrameCaptionButtonContainerViewForTest() {	575 GetFrameCaptionButtonContainerViewForTest() {

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

577 }	577 }

578	578

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

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

581 }	581 }

582	582

583 } // namespace ash	583 } // namespace ash

OLD	NEW