diff options
| author | ben <ben@chromium.org> | 2016-02-06 20:35:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-07 04:36:48 +0000 |
| commit | 3a7cbe0bed9f9b81ab1da4ed0e4dba764345977e (patch) | |
| tree | de412bbb84e68778685e868f2b62d873ffa2937d /components/mus/ws/window_tree_unittest.cc | |
| parent | d345759c314c478c2b35f5ae6e6fd0698e532d2a (diff) | |
| download | chromium_src-3a7cbe0bed9f9b81ab1da4ed0e4dba764345977e.zip chromium_src-3a7cbe0bed9f9b81ab1da4ed0e4dba764345977e.tar.gz chromium_src-3a7cbe0bed9f9b81ab1da4ed0e4dba764345977e.tar.bz2 | |
Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.
Also eliminates use of mojo::shell::mojom::Shell in favor of this base interface.
This means most code doesn't have to use ApplicationImpl - only the places that instantiate them.
TBR=rockot@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1674903003
Cr-Commit-Position: refs/heads/master@{#374049}
Diffstat (limited to 'components/mus/ws/window_tree_unittest.cc')
| -rw-r--r-- | components/mus/ws/window_tree_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/components/mus/ws/window_tree_unittest.cc b/components/mus/ws/window_tree_unittest.cc index 739ffe0..bf16547 100644 --- a/components/mus/ws/window_tree_unittest.cc +++ b/components/mus/ws/window_tree_unittest.cc @@ -27,7 +27,6 @@ #include "components/mus/ws/window_tree_impl.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" -#include "mojo/shell/public/interfaces/service_provider.mojom.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" @@ -347,7 +346,7 @@ class TestDisplayManagerFactory : public DisplayManagerFactory { : cursor_id_storage_(cursor_id_storage) {} ~TestDisplayManagerFactory() {} DisplayManager* CreateDisplayManager( - mojo::ApplicationImpl* app_impl, + mojo::Shell* shell, const scoped_refptr<GpuState>& gpu_state, const scoped_refptr<mus::SurfacesState>& surfaces_state) override { return new TestDisplayManager(cursor_id_storage_); |