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

Unified Diff: components/view_manager/view_manager_service_unittest.cc

Issue 1138073007: Nukes the windowmanager interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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
Index: components/view_manager/view_manager_service_unittest.cc
diff --git a/components/view_manager/view_manager_service_unittest.cc b/components/view_manager/view_manager_service_unittest.cc
index 1e06be68033f92da3ac9c5fea37c797591aee79b..ba6414a8b413ba634f84e8f4930e9dc57aca59a6 100644
--- a/components/view_manager/view_manager_service_unittest.cc
+++ b/components/view_manager/view_manager_service_unittest.cc
@@ -17,8 +17,6 @@
#include "components/view_manager/server_view.h"
#include "components/view_manager/test_change_tracker.h"
#include "components/view_manager/view_manager_service_impl.h"
-#include "components/window_manager/public/interfaces/window_manager.mojom.h"
-#include "components/window_manager/public/interfaces/window_manager_internal.mojom.h"
#include "mojo/application/public/interfaces/service_provider.mojom.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -196,22 +194,6 @@ class TestDisplayManager : public DisplayManager {
DISALLOW_COPY_AND_ASSIGN(TestDisplayManager);
};
-// -----------------------------------------------------------------------------
-
-// Empty implementation of WindowManagerInternal.
-class TestWindowManagerInternal : public mojo::WindowManagerInternal {
- public:
- TestWindowManagerInternal() {}
- ~TestWindowManagerInternal() override {}
-
- // WindowManagerInternal:
- void SetViewManagerClient(mojo::ScopedMessagePipeHandle) override {}
- void OnAccelerator(mojo::EventPtr event) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestWindowManagerInternal);
-};
-
mojo::EventPtr CreatePointerDownEvent(int x, int y) {
mojo::EventPtr event(mojo::Event::New());
event->action = mojo::EVENT_TYPE_POINTER_DOWN;
@@ -262,8 +244,7 @@ class ViewManagerServiceTest : public testing::Test {
// testing::Test:
void SetUp() override {
connection_manager_.reset(new ConnectionManager(
- &delegate_, scoped_ptr<DisplayManager>(new TestDisplayManager),
- &wm_internal_));
+ &delegate_, scoped_ptr<DisplayManager>(new TestDisplayManager)));
scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
connection_manager_.get(), kInvalidConnectionId, std::string(),
std::string("mojo:window_manager"), RootViewId()));
@@ -281,7 +262,6 @@ class ViewManagerServiceTest : public testing::Test {
// TestViewManagerClient that is used for the WM connection.
TestViewManagerClient* wm_client_;
- TestWindowManagerInternal wm_internal_;
TestConnectionManagerDelegate delegate_;
scoped_ptr<ConnectionManager> connection_manager_;
base::MessageLoop message_loop_;
« no previous file with comments | « components/view_manager/view_manager_service_impl.cc ('k') | components/view_manager/window_manager_access_policy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698