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

Unified Diff: ash/touch/touch_observer_hud_unittest.cc

Issue 17063013: Separate projection mode from rest of touch HUD (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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/touch/touch_observer_hud.cc ('k') | chrome/browser/chromeos/system_logs/touch_log_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_observer_hud_unittest.cc
diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc
index 7e8b91bbdda7455ba4c6e47c2a5e824d835c5681..0399407a1f31e45d6d35264d7cb87f1f25f7522a 100644
--- a/ash/touch/touch_observer_hud_unittest.cc
+++ b/ash/touch/touch_observer_hud_unittest.cc
@@ -7,8 +7,10 @@
#include "ash/ash_switches.h"
#include "ash/display/display_manager.h"
#include "ash/root_window_controller.h"
+#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/display_manager_test_api.h"
+#include "ash/touch/touch_hud_debug.h"
#include "ash/wm/property_util.h"
#include "base/command_line.h"
#include "base/format_macros.h"
@@ -208,19 +210,19 @@ class TouchHudTest : public test::AshTestBase {
}
internal::TouchObserverHUD* GetInternalTouchHud() {
- return GetInternalRootController()->touch_observer_hud();
+ return GetInternalRootController()->touch_hud_debug();
}
internal::TouchObserverHUD* GetExternalTouchHud() {
- return GetExternalRootController()->touch_observer_hud();
+ return GetExternalRootController()->touch_hud_debug();
}
internal::TouchObserverHUD* GetPrimaryTouchHud() {
- return GetPrimaryRootController()->touch_observer_hud();
+ return GetPrimaryRootController()->touch_hud_debug();
}
internal::TouchObserverHUD* GetSecondaryTouchHud() {
- return GetSecondaryRootController()->touch_observer_hud();
+ return GetSecondaryRootController()->touch_hud_debug();
}
DisplayInfo CreateDisplayInfo(int64 id, const gfx::Rect& bounds) {
« no previous file with comments | « ash/touch/touch_observer_hud.cc ('k') | chrome/browser/chromeos/system_logs/touch_log_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698