| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 5 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 observers_.ForAllPtrs([](mojom::TouchViewObserver* observer) { | 178 observers_.ForAllPtrs([](mojom::TouchViewObserver* observer) { |
| 179 observer->OnTouchViewToggled(false); | 179 observer->OnTouchViewToggled(false); |
| 180 }); | 180 }); |
| 181 } | 181 } |
| 182 } | 182 } |
| 183 | 183 |
| 184 bool MaximizeModeController::IsMaximizeModeWindowManagerEnabled() const { | 184 bool MaximizeModeController::IsMaximizeModeWindowManagerEnabled() const { |
| 185 return maximize_mode_window_manager_.get() != NULL; | 185 return maximize_mode_window_manager_.get() != NULL; |
| 186 } | 186 } |
| 187 | 187 |
| 188 void MaximizeModeController::AddWindow(WmWindow* window) { | 188 void MaximizeModeController::AddWindow(aura::Window* window) { |
| 189 if (IsMaximizeModeWindowManagerEnabled()) | 189 if (IsMaximizeModeWindowManagerEnabled()) |
| 190 maximize_mode_window_manager_->AddWindow(window); | 190 maximize_mode_window_manager_->AddWindow(window); |
| 191 } | 191 } |
| 192 | 192 |
| 193 void MaximizeModeController::BindRequest( | 193 void MaximizeModeController::BindRequest( |
| 194 mojom::TouchViewManagerRequest request) { | 194 mojom::TouchViewManagerRequest request) { |
| 195 bindings_.AddBinding(this, std::move(request)); | 195 bindings_.AddBinding(this, std::move(request)); |
| 196 } | 196 } |
| 197 | 197 |
| 198 void MaximizeModeController::OnAccelerometerUpdated( | 198 void MaximizeModeController::OnAccelerometerUpdated( |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 477 return elapsed_time.InSeconds() <= kLidRecentlyOpenedDurationSeconds; | 477 return elapsed_time.InSeconds() <= kLidRecentlyOpenedDurationSeconds; |
| 478 } | 478 } |
| 479 | 479 |
| 480 void MaximizeModeController::SetTickClockForTest( | 480 void MaximizeModeController::SetTickClockForTest( |
| 481 std::unique_ptr<base::TickClock> tick_clock) { | 481 std::unique_ptr<base::TickClock> tick_clock) { |
| 482 DCHECK(tick_clock_); | 482 DCHECK(tick_clock_); |
| 483 tick_clock_ = std::move(tick_clock); | 483 tick_clock_ = std::move(tick_clock); |
| 484 } | 484 } |
| 485 | 485 |
| 486 } // namespace ash | 486 } // namespace ash |
| OLD | NEW |