| 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 <memory> | 5 #include <memory> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/threading/thread_task_runner_handle.h" | 9 #include "base/threading/thread_task_runner_handle.h" |
| 10 #include "mojo/public/cpp/bindings/binding.h" | 10 #include "mojo/public/cpp/bindings/binding.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 // Don't care. | 89 // Don't care. |
| 90 } | 90 } |
| 91 aura::PropertyConverter* GetPropertyConverter() override { | 91 aura::PropertyConverter* GetPropertyConverter() override { |
| 92 return &property_converter_; | 92 return &property_converter_; |
| 93 } | 93 } |
| 94 | 94 |
| 95 // aura::WindowManagerDelegate: | 95 // aura::WindowManagerDelegate: |
| 96 void SetWindowManagerClient(aura::WindowManagerClient* client) override { | 96 void SetWindowManagerClient(aura::WindowManagerClient* client) override { |
| 97 window_manager_client_ = client; | 97 window_manager_client_ = client; |
| 98 } | 98 } |
| 99 void OnWmConnected() override {} |
| 99 void OnWmSetBounds(aura::Window* window, const gfx::Rect& bounds) override { | 100 void OnWmSetBounds(aura::Window* window, const gfx::Rect& bounds) override { |
| 100 window->SetBounds(bounds); | 101 window->SetBounds(bounds); |
| 101 } | 102 } |
| 102 bool OnWmSetProperty( | 103 bool OnWmSetProperty( |
| 103 aura::Window* window, | 104 aura::Window* window, |
| 104 const std::string& name, | 105 const std::string& name, |
| 105 std::unique_ptr<std::vector<uint8_t>>* new_data) override { | 106 std::unique_ptr<std::vector<uint8_t>>* new_data) override { |
| 106 return true; | 107 return true; |
| 107 } | 108 } |
| 108 void OnWmSetModalType(aura::Window* window, ui::ModalType type) override {} | 109 void OnWmSetModalType(aura::Window* window, ui::ModalType type) override {} |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 DISALLOW_COPY_AND_ASSIGN(TestWM); | 195 DISALLOW_COPY_AND_ASSIGN(TestWM); |
| 195 }; | 196 }; |
| 196 | 197 |
| 197 } // namespace test | 198 } // namespace test |
| 198 } // namespace ui | 199 } // namespace ui |
| 199 | 200 |
| 200 MojoResult ServiceMain(MojoHandle service_request_handle) { | 201 MojoResult ServiceMain(MojoHandle service_request_handle) { |
| 201 service_manager::ServiceRunner runner(new ui::test::TestWM); | 202 service_manager::ServiceRunner runner(new ui::test::TestWM); |
| 202 return runner.Run(service_request_handle); | 203 return runner.Run(service_request_handle); |
| 203 } | 204 } |
| OLD | NEW |