| 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 // Don't care. | 91 // Don't care. |
| 92 } | 92 } |
| 93 aura::PropertyConverter* GetPropertyConverter() override { | 93 aura::PropertyConverter* GetPropertyConverter() override { |
| 94 return &property_converter_; | 94 return &property_converter_; |
| 95 } | 95 } |
| 96 | 96 |
| 97 // aura::WindowManagerDelegate: | 97 // aura::WindowManagerDelegate: |
| 98 void SetWindowManagerClient(aura::WindowManagerClient* client) override { | 98 void SetWindowManagerClient(aura::WindowManagerClient* client) override { |
| 99 window_manager_client_ = client; | 99 window_manager_client_ = client; |
| 100 } | 100 } |
| 101 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override { | 101 void OnWmSetBounds(aura::Window* window, const gfx::Rect& bounds) override { |
| 102 window->SetBounds(*bounds); | 102 window->SetBounds(bounds); |
| 103 return true; | |
| 104 } | 103 } |
| 105 bool OnWmSetProperty( | 104 bool OnWmSetProperty( |
| 106 aura::Window* window, | 105 aura::Window* window, |
| 107 const std::string& name, | 106 const std::string& name, |
| 108 std::unique_ptr<std::vector<uint8_t>>* new_data) override { | 107 std::unique_ptr<std::vector<uint8_t>>* new_data) override { |
| 109 return true; | 108 return true; |
| 110 } | 109 } |
| 111 void OnWmSetModalType(aura::Window* window, ui::ModalType type) override {} | 110 void OnWmSetModalType(aura::Window* window, ui::ModalType type) override {} |
| 112 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override {} | 111 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override {} |
| 113 aura::Window* OnWmCreateTopLevelWindow( | 112 aura::Window* OnWmCreateTopLevelWindow( |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 DISALLOW_COPY_AND_ASSIGN(TestWM); | 196 DISALLOW_COPY_AND_ASSIGN(TestWM); |
| 198 }; | 197 }; |
| 199 | 198 |
| 200 } // namespace test | 199 } // namespace test |
| 201 } // namespace ui | 200 } // namespace ui |
| 202 | 201 |
| 203 MojoResult ServiceMain(MojoHandle service_request_handle) { | 202 MojoResult ServiceMain(MojoHandle service_request_handle) { |
| 204 service_manager::ServiceRunner runner(new ui::test::TestWM); | 203 service_manager::ServiceRunner runner(new ui::test::TestWM); |
| 205 return runner.Run(service_request_handle); | 204 return runner.Run(service_request_handle); |
| 206 } | 205 } |
| OLD | NEW |