ash/wm/maximize_mode/maximize_mode_window_state.cc - Issue 2095193002: clang-format all of //ash

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

Unified Diff: ash/wm/maximize_mode/maximize_mode_window_state.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc ('k') | ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/maximize_mode/maximize_mode_window_state.cc

diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc

index b96fc2e3ea113db8dae66a7ab25efa0d5fad0395..4de964e6d469176f72b590ff5f46b830714e77a0 100644

--- a/ash/wm/maximize_mode/maximize_mode_window_state.cc

+++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc

@@ -112,7 +112,8 @@ void MaximizeModeWindowState::UpdateWindowPosition(

}

MaximizeModeWindowState::MaximizeModeWindowState(

- aura::Window* window, MaximizeModeWindowManager* creator)

+ aura::Window* window,

+ MaximizeModeWindowManager* creator)

: window_(window),

creator_(creator),

current_state_type_(wm::GetWindowState(window)->GetStateType()),

@@ -166,8 +167,7 @@ void MaximizeModeWindowState::OnWMEvent(wm::WindowState* window_state,

case wm::WM_EVENT_NORMAL:

case wm::WM_EVENT_MAXIMIZE:

case wm::WM_EVENT_DOCK:

- UpdateWindow(window_state,

- GetMaximizedOrCenteredWindowType(window_state),

+ UpdateWindow(window_state, GetMaximizedOrCenteredWindowType(window_state),

true);

return;

case wm::WM_EVENT_MINIMIZE:

@@ -247,8 +247,7 @@ void MaximizeModeWindowState::AttachState(

current_state_type_ != wm::WINDOW_STATE_TYPE_MINIMIZED &&

current_state_type_ != wm::WINDOW_STATE_TYPE_FULLSCREEN &&

current_state_type_ != wm::WINDOW_STATE_TYPE_PINNED) {

- UpdateWindow(window_state,

- GetMaximizedOrCenteredWindowType(window_state),

+ UpdateWindow(window_state, GetMaximizedOrCenteredWindowType(window_state),

true);

}

@@ -313,9 +312,9 @@ void MaximizeModeWindowState::UpdateWindow(wm::WindowState* window_state,

}

wm::WindowStateType MaximizeModeWindowState::GetMaximizedOrCenteredWindowType(

- wm::WindowState* window_state) {

- return window_state->CanMaximize() ? wm::WINDOW_STATE_TYPE_MAXIMIZED :

- wm::WINDOW_STATE_TYPE_NORMAL;

+ wm::WindowState* window_state) {

+ return window_state->CanMaximize() ? wm::WINDOW_STATE_TYPE_MAXIMIZED

+ : wm::WINDOW_STATE_TYPE_NORMAL;

}

void MaximizeModeWindowState::UpdateBounds(wm::WindowState* window_state,

@@ -328,8 +327,7 @@ void MaximizeModeWindowState::UpdateBounds(wm::WindowState* window_state,

if (!bounds_in_parent.IsEmpty() &&

bounds_in_parent != window_state->window()->GetBounds()) {

if (current_state_type_ == wm::WINDOW_STATE_TYPE_MINIMIZED ||

- !window_state->window()->IsVisible() ||

- !animated) {

+ !window_state->window()->IsVisible() || !animated) {

window_state->SetBoundsDirect(bounds_in_parent);

} else {

// If we animate (to) maximized mode, we want to use the cross fade to