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

Unified Diff: ash/aura/pointer_watcher_adapter_unittest.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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
Index: ash/aura/pointer_watcher_adapter_unittest.cc
diff --git a/ash/aura/pointer_watcher_adapter_unittest.cc b/ash/aura/pointer_watcher_adapter_unittest.cc
index ee7e83c6143c7c8aca0fe911be9310a37a64dcf9..1990176506bf5ef26f13db78d393519f7328032c 100644
--- a/ash/aura/pointer_watcher_adapter_unittest.cc
+++ b/ash/aura/pointer_watcher_adapter_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/shell_port.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm_shell.h"
#include "ui/events/base_event_utils.h"
#include "ui/events/event.h"
#include "ui/events/test/event_generator.h"
@@ -29,9 +29,11 @@ enum TestPointerCaptureEvents {
class TestPointerWatcher : public views::PointerWatcher {
public:
explicit TestPointerWatcher(views::PointerWatcherEventTypes events) {
- WmShell::Get()->AddPointerWatcher(this, events);
+ ShellPort::Get()->AddPointerWatcher(this, events);
+ }
+ ~TestPointerWatcher() override {
+ ShellPort::Get()->RemovePointerWatcher(this);
}
- ~TestPointerWatcher() override { WmShell::Get()->RemovePointerWatcher(this); }
void ClearCounts() {
pointer_event_count_ = capture_changed_count_ = mouse_wheel_event_count_ =

Powered by Google App Engine
This is Rietveld 408576698