| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/web_view/frame.h" | 5 #include "components/web_view/frame.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 window_and_frame_->WaitForViewAndFrame(); | 347 window_and_frame_->WaitForViewAndFrame(); |
| 348 return std::move(window_and_frame_); | 348 return std::move(window_and_frame_); |
| 349 } | 349 } |
| 350 | 350 |
| 351 private: | 351 private: |
| 352 // ApplicationTestBase: | 352 // ApplicationTestBase: |
| 353 mojo::ShellClient* GetShellClient() override { return this; } | 353 mojo::ShellClient* GetShellClient() override { return this; } |
| 354 | 354 |
| 355 // mojo::ShellClient implementation. | 355 // mojo::ShellClient implementation. |
| 356 bool AcceptConnection(mojo::Connection* connection) override { | 356 bool AcceptConnection(mojo::Connection* connection) override { |
| 357 connection->AddService<mus::mojom::WindowTreeClient>(this); | 357 connection->AddInterface<mus::mojom::WindowTreeClient>(this); |
| 358 connection->AddService<mojom::FrameClient>(this); | 358 connection->AddInterface<mojom::FrameClient>(this); |
| 359 return true; | 359 return true; |
| 360 } | 360 } |
| 361 | 361 |
| 362 // Overridden from WindowTreeDelegate: | 362 // Overridden from WindowTreeDelegate: |
| 363 void OnEmbed(Window* root) override { | 363 void OnEmbed(Window* root) override { |
| 364 most_recent_connection_ = root->connection(); | 364 most_recent_connection_ = root->connection(); |
| 365 QuitRunLoop(); | 365 QuitRunLoop(); |
| 366 } | 366 } |
| 367 void OnConnectionLost(WindowTreeConnection* connection) override {} | 367 void OnConnectionLost(WindowTreeConnection* connection) override {} |
| 368 | 368 |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 570 base::TimeTicks navigation_start_time = base::TimeTicks::FromInternalValue(1); | 570 base::TimeTicks navigation_start_time = base::TimeTicks::FromInternalValue(1); |
| 571 scoped_ptr<WindowAndFrame> navigated_child_view_and_frame = | 571 scoped_ptr<WindowAndFrame> navigated_child_view_and_frame = |
| 572 NavigateFrameWithStartTime(child_view_and_frame.get(), | 572 NavigateFrameWithStartTime(child_view_and_frame.get(), |
| 573 navigation_start_time); | 573 navigation_start_time); |
| 574 EXPECT_EQ(navigation_start_time, | 574 EXPECT_EQ(navigation_start_time, |
| 575 navigated_child_view_and_frame->test_frame_client() | 575 navigated_child_view_and_frame->test_frame_client() |
| 576 ->last_navigation_start_time()); | 576 ->last_navigation_start_time()); |
| 577 } | 577 } |
| 578 | 578 |
| 579 } // namespace web_view | 579 } // namespace web_view |
| OLD | NEW |