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 "mash/webtest/webtest.h" | 5 #include "mash/webtest/webtest.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 GetProxy(&view_client); | 189 GetProxy(&view_client); |
190 view_factory->CreateView(std::move(view_client), GetProxy(&view)); | 190 view_factory->CreateView(std::move(view_client), GetProxy(&view)); |
191 UI* ui = new UI(this, std::move(view), std::move(view_client_request)); | 191 UI* ui = new UI(this, std::move(view), std::move(view_client_request)); |
192 views::Widget* window = views::Widget::CreateWindowWithContextAndBounds( | 192 views::Widget* window = views::Widget::CreateWindowWithContextAndBounds( |
193 ui, nullptr, gfx::Rect(50, 10, 600, 600)); | 193 ui, nullptr, gfx::Rect(50, 10, 600, 600)); |
194 ui->NavigateTo(GURL("http://www.theverge.com/")); | 194 ui->NavigateTo(GURL("http://www.theverge.com/")); |
195 window->Show(); | 195 window->Show(); |
196 AddWindow(window); | 196 AddWindow(window); |
197 } | 197 } |
198 | 198 |
199 void Webtest::Create(shell::Connection* connection, | 199 void Webtest::Create(const shell::Identity& remote_identity, |
200 mojom::LaunchableRequest request) { | 200 mojom::LaunchableRequest request) { |
201 bindings_.AddBinding(this, std::move(request)); | 201 bindings_.AddBinding(this, std::move(request)); |
202 } | 202 } |
203 | 203 |
204 } // namespace webtest | 204 } // namespace webtest |
205 } // namespace mash | 205 } // namespace mash |
OLD | NEW |