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

Unified Diff: ash/wm/workspace_controller.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/workspace/workspace_window_resizer_unittest.cc ('k') | ash/wm/workspace_controller_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller.cc
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 3836a4bc38d00dcb706e0e0f05631cde34c5f9fb..99c12cd20aee455b78c41863975b3dd62a1f2212 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -52,8 +52,7 @@ WorkspaceController::WorkspaceController(
event_handler_(new WorkspaceEventHandler),
layout_manager_(new WorkspaceLayoutManager(WmWindowAura::Get(viewport),
std::move(delegate))) {
- SetWindowVisibilityAnimationTransition(
- viewport_, ::wm::ANIMATE_NONE);
+ SetWindowVisibilityAnimationTransition(viewport_, ::wm::ANIMATE_NONE);
WmWindowAura::Get(viewport_)->SetLayoutManager(
base::WrapUnique(layout_manager_));
@@ -68,8 +67,9 @@ WorkspaceController::~WorkspaceController() {
wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {
if (!shelf_)
return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
- const aura::Window* topmost_fullscreen_window = GetRootWindowController(
- viewport_->GetRootWindow())->GetWindowForFullscreenMode();
+ const aura::Window* topmost_fullscreen_window =
+ GetRootWindowController(viewport_->GetRootWindow())
+ ->GetWindowForFullscreenMode();
if (topmost_fullscreen_window &&
!wm::GetWindowState(topmost_fullscreen_window)->ignored_by_shelf()) {
return wm::WORKSPACE_WINDOW_STATE_FULL_SCREEN;
@@ -77,8 +77,9 @@ wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {
// These are the container ids of containers which may contain windows that
// may overlap the launcher shelf and affect its transparency.
- const int kWindowContainerIds[] = {kShellWindowId_DefaultContainer,
- kShellWindowId_DockedContainer, };
+ const int kWindowContainerIds[] = {
+ kShellWindowId_DefaultContainer, kShellWindowId_DockedContainer,
+ };
const gfx::Rect shelf_bounds(shelf_->GetIdealBounds());
bool window_overlaps_launcher = false;
for (size_t idx = 0; idx < arraysize(kWindowContainerIds); idx++) {
@@ -116,8 +117,8 @@ void WorkspaceController::DoInitialAnimation() {
viewport_->Show();
viewport_->layer()->SetOpacity(0.0f);
- SetTransformForScaleAnimation(
- viewport_->layer(), LAYER_SCALE_ANIMATION_ABOVE);
+ SetTransformForScaleAnimation(viewport_->layer(),
+ LAYER_SCALE_ANIMATION_ABOVE);
// In order for pause to work we need to stop animations.
viewport_->layer()->GetAnimator()->StopAnimating();
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer_unittest.cc ('k') | ash/wm/workspace_controller_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698