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

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

Issue 834163002: Fixes smart deploy causing crash on shutdown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments by Sky. Created 5 years, 11 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 "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/accelerators/accelerator_table.h" 8 #include "ash/accelerators/accelerator_table.h"
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 base::TimeDelta elapsed_time = now - last_lid_open_time_; 507 base::TimeDelta elapsed_time = now - last_lid_open_time_;
508 return elapsed_time <= kLidRecentlyOpenedDuration; 508 return elapsed_time <= kLidRecentlyOpenedDuration;
509 } 509 }
510 510
511 void MaximizeModeController::SetTickClockForTest( 511 void MaximizeModeController::SetTickClockForTest(
512 scoped_ptr<base::TickClock> tick_clock) { 512 scoped_ptr<base::TickClock> tick_clock) {
513 DCHECK(tick_clock_); 513 DCHECK(tick_clock_);
514 tick_clock_ = tick_clock.Pass(); 514 tick_clock_ = tick_clock.Pass();
515 } 515 }
516 516
517 void MaximizeModeController::InstallEventBlockerForTest(
518 scoped_ptr<ScopedDisableInternalMouseAndKeyboard> blocker) {
519 event_blocker_ = blocker.Pass();
520 }
521
517 } // namespace ash 522 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698