Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1698)

Unified Diff: ash/wm/lock_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/lock_state_controller_unittest.cc ('k') | ash/wm/maximize_mode/accelerometer_test_data_literals.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/lock_window_state.cc
diff --git a/ash/wm/lock_window_state.cc b/ash/wm/lock_window_state.cc
index e798dec6cda8fb265812210f83f8ecac59ac01cc..4e1254f920552c4cd12dcc14eddb8d2e1a4614f6 100644
--- a/ash/wm/lock_window_state.cc
+++ b/ash/wm/lock_window_state.cc
@@ -29,11 +29,9 @@
namespace ash {
LockWindowState::LockWindowState(aura::Window* window)
- : current_state_type_(wm::GetWindowState(window)->GetStateType()) {
-}
+ : current_state_type_(wm::GetWindowState(window)->GetStateType()) {}
-LockWindowState::~LockWindowState() {
-}
+LockWindowState::~LockWindowState() {}
void LockWindowState::OnWMEvent(wm::WindowState* window_state,
const wm::WMEvent* event) {
@@ -105,13 +103,11 @@ void LockWindowState::AttachState(wm::WindowState* window_state,
if (current_state_type_ != wm::WINDOW_STATE_TYPE_MAXIMIZED &&
current_state_type_ != wm::WINDOW_STATE_TYPE_MINIMIZED &&
current_state_type_ != wm::WINDOW_STATE_TYPE_FULLSCREEN) {
- UpdateWindow(window_state,
- GetMaximizedOrCenteredWindowType(window_state));
+ UpdateWindow(window_state, GetMaximizedOrCenteredWindowType(window_state));
}
}
-void LockWindowState::DetachState(wm::WindowState* window_state) {
-}
+void LockWindowState::DetachState(wm::WindowState* window_state) {}
// static
wm::WindowState* LockWindowState::SetLockWindowState(aura::Window* window) {
@@ -127,7 +123,7 @@ void LockWindowState::UpdateWindow(wm::WindowState* window_state,
DCHECK(target_state == wm::WINDOW_STATE_TYPE_MINIMIZED ||
target_state == wm::WINDOW_STATE_TYPE_MAXIMIZED ||
(target_state == wm::WINDOW_STATE_TYPE_NORMAL &&
- !window_state->CanMaximize()) ||
+ !window_state->CanMaximize()) ||
target_state == wm::WINDOW_STATE_TYPE_FULLSCREEN);
if (target_state == wm::WINDOW_STATE_TYPE_MINIMIZED) {
@@ -166,9 +162,9 @@ void LockWindowState::UpdateWindow(wm::WindowState* window_state,
}
wm::WindowStateType LockWindowState::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;
}
gfx::Rect GetBoundsForLockWindow(aura::Window* window) {
@@ -190,8 +186,7 @@ void LockWindowState::UpdateBounds(wm::WindowState* window_state) {
keyboard::KeyboardController::GetInstance();
gfx::Rect keyboard_bounds;
- if (keyboard_controller &&
- !keyboard::IsKeyboardOverscrollEnabled() &&
+ if (keyboard_controller && !keyboard::IsKeyboardOverscrollEnabled() &&
keyboard_controller->keyboard_visible()) {
keyboard_bounds = keyboard_controller->current_keyboard_bounds();
}
« no previous file with comments | « ash/wm/lock_state_controller_unittest.cc ('k') | ash/wm/maximize_mode/accelerometer_test_data_literals.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698