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

Side by Side Diff: ash/wm/maximize_mode/maximize_mode_controller.cc

Issue 2103913003: Converts MaximizeModeWindowManager to use ash/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@maximize_mode_event_handler
Patch Set: fix chrome Created 4 years, 5 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 unified diff | Download patch
OLDNEW
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/accelerators/accelerator_controller.h" 9 #include "ash/accelerators/accelerator_controller.h"
10 #include "ash/accelerators/accelerator_table.h" 10 #include "ash/accelerators/accelerator_table.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 maximize_mode_window_manager_.reset(); 172 maximize_mode_window_manager_.reset();
173 WmShell::Get()->RecordUserMetricsAction(UMA_MAXIMIZE_MODE_DISABLED); 173 WmShell::Get()->RecordUserMetricsAction(UMA_MAXIMIZE_MODE_DISABLED);
174 shell->OnMaximizeModeEnded(); 174 shell->OnMaximizeModeEnded();
175 } 175 }
176 } 176 }
177 177
178 bool MaximizeModeController::IsMaximizeModeWindowManagerEnabled() const { 178 bool MaximizeModeController::IsMaximizeModeWindowManagerEnabled() const {
179 return maximize_mode_window_manager_.get() != NULL; 179 return maximize_mode_window_manager_.get() != NULL;
180 } 180 }
181 181
182 void MaximizeModeController::AddWindow(aura::Window* window) { 182 void MaximizeModeController::AddWindow(WmWindow* window) {
183 if (IsMaximizeModeWindowManagerEnabled()) 183 if (IsMaximizeModeWindowManagerEnabled())
184 maximize_mode_window_manager_->AddWindow(window); 184 maximize_mode_window_manager_->AddWindow(window);
185 } 185 }
186 186
187 #if defined(OS_CHROMEOS) 187 #if defined(OS_CHROMEOS)
188 void MaximizeModeController::OnAccelerometerUpdated( 188 void MaximizeModeController::OnAccelerometerUpdated(
189 scoped_refptr<const chromeos::AccelerometerUpdate> update) { 189 scoped_refptr<const chromeos::AccelerometerUpdate> update) {
190 bool first_accelerometer_update = !have_seen_accelerometer_data_; 190 bool first_accelerometer_update = !have_seen_accelerometer_data_;
191 have_seen_accelerometer_data_ = true; 191 have_seen_accelerometer_data_ = true;
192 192
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 return elapsed_time.InSeconds() <= kLidRecentlyOpenedDurationSeconds; 432 return elapsed_time.InSeconds() <= kLidRecentlyOpenedDurationSeconds;
433 } 433 }
434 434
435 void MaximizeModeController::SetTickClockForTest( 435 void MaximizeModeController::SetTickClockForTest(
436 std::unique_ptr<base::TickClock> tick_clock) { 436 std::unique_ptr<base::TickClock> tick_clock) {
437 DCHECK(tick_clock_); 437 DCHECK(tick_clock_);
438 tick_clock_ = std::move(tick_clock); 438 tick_clock_ = std::move(tick_clock);
439 } 439 }
440 440
441 } // namespace ash 441 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/maximize_mode/maximize_mode_controller.h ('k') | ash/wm/maximize_mode/maximize_mode_window_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698