| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <utility> | 5 #include <utility> |
| 6 | 6 |
| 7 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
| 8 #include "mojo/public/cpp/bindings/binding.h" | 8 #include "mojo/public/cpp/bindings/binding.h" |
| 9 #include "services/shell/public/cpp/connector.h" | 9 #include "services/shell/public/cpp/connector.h" |
| 10 #include "services/shell/public/cpp/service.h" | 10 #include "services/shell/public/cpp/service.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 // ui::WindowTreeClientDelegate: | 35 // ui::WindowTreeClientDelegate: |
| 36 void OnEmbed(ui::Window* root) override { | 36 void OnEmbed(ui::Window* root) override { |
| 37 // WindowTreeClients configured as the window manager should never get | 37 // WindowTreeClients configured as the window manager should never get |
| 38 // OnEmbed(). | 38 // OnEmbed(). |
| 39 NOTREACHED(); | 39 NOTREACHED(); |
| 40 } | 40 } |
| 41 void OnDidDestroyClient(ui::WindowTreeClient* client) override { | 41 void OnDidDestroyClient(ui::WindowTreeClient* client) override { |
| 42 window_tree_client_ = nullptr; | 42 window_tree_client_ = nullptr; |
| 43 } | 43 } |
| 44 void OnEventObserved(const ui::Event& event, ui::Window* target) override { | 44 void OnPointerWatcherEvent(const ui::PointerEvent& event, |
| 45 ui::Window* target) override { |
| 45 // Don't care. | 46 // Don't care. |
| 46 } | 47 } |
| 47 | 48 |
| 48 // ui::WindowManagerDelegate: | 49 // ui::WindowManagerDelegate: |
| 49 void SetWindowManagerClient(ui::WindowManagerClient* client) override { | 50 void SetWindowManagerClient(ui::WindowManagerClient* client) override { |
| 50 window_manager_client_ = client; | 51 window_manager_client_ = client; |
| 51 } | 52 } |
| 52 bool OnWmSetBounds(ui::Window* window, gfx::Rect* bounds) override { | 53 bool OnWmSetBounds(ui::Window* window, gfx::Rect* bounds) override { |
| 53 return true; | 54 return true; |
| 54 } | 55 } |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 DISALLOW_COPY_AND_ASSIGN(TestWM); | 99 DISALLOW_COPY_AND_ASSIGN(TestWM); |
| 99 }; | 100 }; |
| 100 | 101 |
| 101 } // namespace test | 102 } // namespace test |
| 102 } // namespace ui | 103 } // namespace ui |
| 103 | 104 |
| 104 MojoResult MojoMain(MojoHandle shell_handle) { | 105 MojoResult MojoMain(MojoHandle shell_handle) { |
| 105 shell::ServiceRunner runner(new ui::test::TestWM); | 106 shell::ServiceRunner runner(new ui::test::TestWM); |
| 106 return runner.Run(shell_handle); | 107 return runner.Run(shell_handle); |
| 107 } | 108 } |
| OLD | NEW |