| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 return wm_state_.capture_controller(); | 98 return wm_state_.capture_controller(); |
| 99 } | 99 } |
| 100 aura::PropertyConverter* GetPropertyConverter() override { | 100 aura::PropertyConverter* GetPropertyConverter() override { |
| 101 return &property_converter_; | 101 return &property_converter_; |
| 102 } | 102 } |
| 103 | 103 |
| 104 // aura::WindowManagerDelegate: | 104 // aura::WindowManagerDelegate: |
| 105 void SetWindowManagerClient(aura::WindowManagerClient* client) override { | 105 void SetWindowManagerClient(aura::WindowManagerClient* client) override { |
| 106 window_manager_client_ = client; | 106 window_manager_client_ = client; |
| 107 } | 107 } |
| 108 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override { | 108 void OnWmSetBounds(aura::Window* window, const gfx::Rect& bounds) override {} |
| 109 return true; | |
| 110 } | |
| 111 bool OnWmSetProperty( | 109 bool OnWmSetProperty( |
| 112 aura::Window* window, | 110 aura::Window* window, |
| 113 const std::string& name, | 111 const std::string& name, |
| 114 std::unique_ptr<std::vector<uint8_t>>* new_data) override { | 112 std::unique_ptr<std::vector<uint8_t>>* new_data) override { |
| 115 return true; | 113 return true; |
| 116 } | 114 } |
| 117 aura::Window* OnWmCreateTopLevelWindow( | 115 aura::Window* OnWmCreateTopLevelWindow( |
| 118 ui::mojom::WindowType window_type, | 116 ui::mojom::WindowType window_type, |
| 119 std::map<std::string, std::vector<uint8_t>>* properties) override { | 117 std::map<std::string, std::vector<uint8_t>>* properties) override { |
| 120 aura::Window* window = new aura::Window(nullptr); | 118 aura::Window* window = new aura::Window(nullptr); |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 DISALLOW_COPY_AND_ASSIGN(TestWM); | 183 DISALLOW_COPY_AND_ASSIGN(TestWM); |
| 186 }; | 184 }; |
| 187 | 185 |
| 188 } // namespace test | 186 } // namespace test |
| 189 } // namespace ui | 187 } // namespace ui |
| 190 | 188 |
| 191 MojoResult ServiceMain(MojoHandle service_request_handle) { | 189 MojoResult ServiceMain(MojoHandle service_request_handle) { |
| 192 service_manager::ServiceRunner runner(new ui::test::TestWM); | 190 service_manager::ServiceRunner runner(new ui::test::TestWM); |
| 193 return runner.Run(service_request_handle); | 191 return runner.Run(service_request_handle); |
| 194 } | 192 } |
| OLD | NEW |