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

Unified Diff: chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc

Issue 2780623002: exo: Fix multi-display hardware cursor (Closed)
Patch Set: Fix style error Created 3 years, 7 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 | « no previous file | components/exo/pointer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc
diff --git a/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc b/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc
index 1dcec90d228f4a829cc08d2c09b22f140175cf9a..5900062d2d0264c7c7b541eb078b3b1bc73c503f 100644
--- a/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc
+++ b/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc
@@ -13,6 +13,7 @@
#include "components/arc/common/accessibility_helper.mojom.h"
#include "components/exo/wm_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/display.h"
#include "ui/display/manager/managed_display_info.h"
namespace arc {
@@ -24,16 +25,23 @@ class ArcAccessibilityHelperBridgeTest : public testing::Test {
FakeWMHelper() = default;
private:
- const display::ManagedDisplayInfo GetDisplayInfo(
+ const display::ManagedDisplayInfo& GetDisplayInfo(
int64_t display_id) const override {
- return display::ManagedDisplayInfo(display_id, "", false);
+ static const display::ManagedDisplayInfo info;
+ return info;
+ }
+ aura::Window* GetPrimaryDisplayContainer(int container_id) override {
+ return nullptr;
}
- aura::Window* GetContainer(int container_id) override { return nullptr; }
aura::Window* GetActiveWindow() const override { return nullptr; }
aura::Window* GetFocusedWindow() const override { return nullptr; }
ui::CursorSetType GetCursorSet() const override {
return ui::CursorSetType::CURSOR_SET_NORMAL;
}
+ const display::Display& GetCursorDisplay() const override {
+ static const display::Display display;
+ return display;
+ }
void AddPreTargetHandler(ui::EventHandler* handler) override {}
void PrependPreTargetHandler(ui::EventHandler* handler) override {}
void RemovePreTargetHandler(ui::EventHandler* handler) override {}
« no previous file with comments | « no previous file | components/exo/pointer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698