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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 } | 100 } |
101 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override { | 101 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override { |
102 return true; | 102 return true; |
103 } | 103 } |
104 bool OnWmSetProperty( | 104 bool OnWmSetProperty( |
105 aura::Window* window, | 105 aura::Window* window, |
106 const std::string& name, | 106 const std::string& name, |
107 std::unique_ptr<std::vector<uint8_t>>* new_data) override { | 107 std::unique_ptr<std::vector<uint8_t>>* new_data) override { |
108 return true; | 108 return true; |
109 } | 109 } |
| 110 bool OnWmSetModalType(aura::Window* window, ui::ModalType type) override { |
| 111 return true; |
| 112 } |
110 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override {} | 113 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override {} |
111 aura::Window* OnWmCreateTopLevelWindow( | 114 aura::Window* OnWmCreateTopLevelWindow( |
112 ui::mojom::WindowType window_type, | 115 ui::mojom::WindowType window_type, |
113 std::map<std::string, std::vector<uint8_t>>* properties) override { | 116 std::map<std::string, std::vector<uint8_t>>* properties) override { |
114 aura::Window* window = new aura::Window(nullptr); | 117 aura::Window* window = new aura::Window(nullptr); |
115 SetWindowType(window, window_type); | 118 SetWindowType(window, window_type); |
116 window->Init(LAYER_NOT_DRAWN); | 119 window->Init(LAYER_NOT_DRAWN); |
117 window->SetBounds(gfx::Rect(10, 10, 500, 500)); | 120 window->SetBounds(gfx::Rect(10, 10, 500, 500)); |
118 root_->AddChild(window); | 121 root_->AddChild(window); |
119 return window; | 122 return window; |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 DISALLOW_COPY_AND_ASSIGN(TestWM); | 192 DISALLOW_COPY_AND_ASSIGN(TestWM); |
190 }; | 193 }; |
191 | 194 |
192 } // namespace test | 195 } // namespace test |
193 } // namespace ui | 196 } // namespace ui |
194 | 197 |
195 MojoResult ServiceMain(MojoHandle service_request_handle) { | 198 MojoResult ServiceMain(MojoHandle service_request_handle) { |
196 service_manager::ServiceRunner runner(new ui::test::TestWM); | 199 service_manager::ServiceRunner runner(new ui::test::TestWM); |
197 return runner.Run(service_request_handle); | 200 return runner.Run(service_request_handle); |
198 } | 201 } |
OLD | NEW |