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

Unified Diff: ash/wm/resize_handle_window_targeter.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/power_button_controller.cc ('k') | ash/wm/resize_shadow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/resize_handle_window_targeter.cc
diff --git a/ash/wm/resize_handle_window_targeter.cc b/ash/wm/resize_handle_window_targeter.cc
index 8b983232cc6ffd4584503e4999d8c552e6becd5f..e150eea94daa4022ef149f1ad43667fa493d7232 100644
--- a/ash/wm/resize_handle_window_targeter.cc
+++ b/ash/wm/resize_handle_window_targeter.cc
@@ -16,8 +16,7 @@ namespace ash {
ResizeHandleWindowTargeter::ResizeHandleWindowTargeter(
aura::Window* window,
ImmersiveFullscreenController* controller)
- : window_(window),
- immersive_controller_(controller) {
+ : window_(window), immersive_controller_(controller) {
wm::WindowState* window_state = wm::GetWindowState(window_);
OnPostWindowStateTypeChange(window_state, wm::WINDOW_STATE_TYPE_DEFAULT);
window_state->AddObserver(this);
@@ -37,10 +36,9 @@ void ResizeHandleWindowTargeter::OnPostWindowStateTypeChange(
if (window_state->IsMaximizedOrFullscreenOrPinned()) {
frame_border_inset_ = gfx::Insets();
} else {
- frame_border_inset_ = gfx::Insets(kResizeInsideBoundsSize,
- kResizeInsideBoundsSize,
- kResizeInsideBoundsSize,
- kResizeInsideBoundsSize);
+ frame_border_inset_ =
+ gfx::Insets(kResizeInsideBoundsSize, kResizeInsideBoundsSize,
+ kResizeInsideBoundsSize, kResizeInsideBoundsSize);
}
}
@@ -56,8 +54,7 @@ aura::Window* ResizeHandleWindowTargeter::FindTargetForLocatedEvent(
if (window == window_) {
gfx::Insets insets;
if (immersive_controller_ && immersive_controller_->IsEnabled() &&
- !immersive_controller_->IsRevealed() &&
- event->IsTouchEvent()) {
+ !immersive_controller_->IsRevealed() && event->IsTouchEvent()) {
// If the window is in immersive fullscreen, and top-of-window views are
// not revealed, then touch events towards the top of the window
// should not reach the child window so that touch gestures can be used to
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | ash/wm/resize_shadow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698