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

Unified Diff: ash/wm/maximize_mode/maximize_mode_controller.h

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/virtual_keyboard_controller_unittest.cc ('k') | ash/wm/maximize_mode/maximize_mode_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/maximize_mode/maximize_mode_controller.h
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.h b/ash/wm/maximize_mode/maximize_mode_controller.h
index f6c7fedb5e427cbee977e82b61cfa4cd85f83a6b..6f593d42fa41cea66e77ee4f33df60e4044ae947 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller.h
+++ b/ash/wm/maximize_mode/maximize_mode_controller.h
@@ -35,6 +35,7 @@ class MaximizeModeWindowManager;
class MaximizeModeWindowManagerTest;
namespace test {
class MultiUserWindowManagerChromeOSTest;
+class VirtualKeyboardControllerTest;
}
// MaximizeModeController listens to accelerometer events and automatically
@@ -135,11 +136,16 @@ class ASH_EXPORT MaximizeModeController
friend class MaximizeModeControllerTest;
friend class MaximizeModeWindowManagerTest;
friend class test::MultiUserWindowManagerChromeOSTest;
+ friend class test::VirtualKeyboardControllerTest;
// Set the TickClock. This is only to be used by tests that need to
// artificially and deterministically control the current time.
void SetTickClockForTest(scoped_ptr<base::TickClock> tick_clock);
+ // Set the event blocker for testing.
+ void InstallEventBlockerForTest(
sky 2015/01/07 16:01:52 Not that your test is a friend you don't need this
rsadam 2015/01/07 16:04:32 That was my first approach, however I got errors t
rsadam 2015/01/07 16:13:02 Done.
+ scoped_ptr<ScopedDisableInternalMouseAndKeyboard> blocker);
+
// Detect hinge rotation from |base| and |lid| accelerometers and
// automatically start / stop maximize mode.
void HandleHingeRotation(const gfx::Vector3dF& base,
« no previous file with comments | « ash/virtual_keyboard_controller_unittest.cc ('k') | ash/wm/maximize_mode/maximize_mode_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698