Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: components/web_view/frame_apptest.cc

Issue 1423133003: Routes calls to WM through WS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no braces Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 void OnEmbed(Window* root) override { 364 void OnEmbed(Window* root) override {
365 most_recent_connection_ = root->connection(); 365 most_recent_connection_ = root->connection();
366 QuitRunLoop(); 366 QuitRunLoop();
367 } 367 }
368 void OnConnectionLost(WindowTreeConnection* connection) override {} 368 void OnConnectionLost(WindowTreeConnection* connection) override {}
369 369
370 // Overridden from testing::Test: 370 // Overridden from testing::Test:
371 void SetUp() override { 371 void SetUp() override {
372 ApplicationTestBase::SetUp(); 372 ApplicationTestBase::SetUp();
373 373
374 mus::CreateSingleWindowTreeHost(application_impl(), this, &host_); 374 mus::CreateSingleWindowTreeHost(application_impl(), this, &host_, nullptr);
375 375
376 ASSERT_TRUE(DoRunLoopWithTimeout()); 376 ASSERT_TRUE(DoRunLoopWithTimeout());
377 std::swap(window_manager_, most_recent_connection_); 377 std::swap(window_manager_, most_recent_connection_);
378 378
379 // Creates a FrameTree, which creates a single frame. Wait for the 379 // Creates a FrameTree, which creates a single frame. Wait for the
380 // FrameClient to be connected to. 380 // FrameClient to be connected to.
381 frame_tree_delegate_.reset(new TestFrameTreeDelegate(application_impl())); 381 frame_tree_delegate_.reset(new TestFrameTreeDelegate(application_impl()));
382 scoped_ptr<FrameConnection> frame_connection = 382 scoped_ptr<FrameConnection> frame_connection =
383 CreateFrameConnection(application_impl()); 383 CreateFrameConnection(application_impl());
384 mojom::FrameClient* frame_client = frame_connection->frame_client(); 384 mojom::FrameClient* frame_client = frame_connection->frame_client();
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 scoped_ptr<WindowAndFrame> navigated_child_view_and_frame = 566 scoped_ptr<WindowAndFrame> navigated_child_view_and_frame =
567 NavigateFrameWithStartTime(child_view_and_frame.get(), 567 NavigateFrameWithStartTime(child_view_and_frame.get(),
568 navigation_start_time) 568 navigation_start_time)
569 .Pass(); 569 .Pass();
570 EXPECT_EQ(navigation_start_time, 570 EXPECT_EQ(navigation_start_time,
571 navigated_child_view_and_frame->test_frame_client() 571 navigated_child_view_and_frame->test_frame_client()
572 ->last_navigation_start_time()); 572 ->last_navigation_start_time());
573 } 573 }
574 574
575 } // namespace web_view 575 } // namespace web_view
OLDNEW
« no previous file with comments | « components/mus/ws/window_tree_unittest.cc ('k') | components/web_view/test_runner/test_runner_application_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698