| Index: ash/wm/workspace/workspace_event_handler_unittest.cc
|
| diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc
|
| index 595c63310d16eb8798b5909df16ace9e55904a6c..63d2acc1da9e685333c7f9a87232492e62a2c850 100644
|
| --- a/ash/wm/workspace/workspace_event_handler_unittest.cc
|
| +++ b/ash/wm/workspace/workspace_event_handler_unittest.cc
|
| @@ -73,16 +73,14 @@ class WorkspaceEventHandlerTest : public test::AshTestBase {
|
| // Keeps track of the properties changed of a particular window.
|
| class WindowPropertyObserver : public aura::WindowObserver {
|
| public:
|
| - explicit WindowPropertyObserver(aura::Window* window)
|
| - : window_(window) {
|
| + explicit WindowPropertyObserver(aura::Window* window) : window_(window) {
|
| window->AddObserver(this);
|
| }
|
|
|
| ~WindowPropertyObserver() override { window_->RemoveObserver(this); }
|
|
|
| bool DidPropertyChange(const void* property) const {
|
| - return std::find(properties_changed_.begin(),
|
| - properties_changed_.end(),
|
| + return std::find(properties_changed_.begin(), properties_changed_.end(),
|
| property) != properties_changed_.end();
|
| }
|
|
|
| @@ -333,8 +331,8 @@ TEST_F(WorkspaceEventHandlerTest, DoubleClickCaptionTogglesMaximize) {
|
|
|
| wm::WindowState* window_state = wm::GetWindowState(window.get());
|
| gfx::Rect restore_bounds = window->bounds();
|
| - gfx::Rect work_area_in_parent = ScreenUtil::GetDisplayWorkAreaBoundsInParent(
|
| - window.get());
|
| + gfx::Rect work_area_in_parent =
|
| + ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get());
|
|
|
| EXPECT_FALSE(window_state->IsMaximized());
|
|
|
| @@ -457,15 +455,14 @@ TEST_F(WorkspaceEventHandlerTest, DeleteWhileInRunLoop) {
|
| ASSERT_TRUE(aura::client::GetWindowMoveClient(window->GetRootWindow()));
|
| base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, window.get());
|
| aura::client::GetWindowMoveClient(window->GetRootWindow())
|
| - ->RunMoveLoop(window.release(),
|
| - gfx::Vector2d(),
|
| + ->RunMoveLoop(window.release(), gfx::Vector2d(),
|
| aura::client::WINDOW_MOVE_SOURCE_MOUSE);
|
| }
|
|
|
| // Verifies that double clicking in the header does not maximize if the target
|
| // component has changed.
|
| TEST_F(WorkspaceEventHandlerTest,
|
| - DoubleClickTwoDifferentTargetsDoesntMaximize) {
|
| + DoubleClickTwoDifferentTargetsDoesntMaximize) {
|
| aura::test::TestWindowDelegate delegate;
|
| std::unique_ptr<aura::Window> window(
|
| CreateTestWindow(&delegate, gfx::Rect(1, 2, 30, 40)));
|
| @@ -512,8 +509,7 @@ TEST_F(WorkspaceEventHandlerTest, DoubleTapTwoDifferentTargetsDoesntMaximize) {
|
| EXPECT_FALSE(window_state->IsMaximized());
|
| }
|
|
|
| -TEST_F(WorkspaceEventHandlerTest,
|
| - RightClickDuringDoubleClickDoesntMaximize) {
|
| +TEST_F(WorkspaceEventHandlerTest, RightClickDuringDoubleClickDoesntMaximize) {
|
| aura::test::TestWindowDelegate delegate;
|
| std::unique_ptr<aura::Window> window(
|
| CreateTestWindow(&delegate, gfx::Rect(1, 2, 30, 40)));
|
|
|