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

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

Issue 1390353007: Adds MUSViewsInit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix windows Created 5 years, 2 months 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
« no previous file with comments | « components/pdf_viewer/pdf_viewer.cc ('k') | components/web_view/web_view_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 frame_tree_.reset(); 376 frame_tree_.reset();
377 frame_tree_delegate_.reset(); 377 frame_tree_delegate_.reset();
378 ApplicationTestBase::TearDown(); 378 ApplicationTestBase::TearDown();
379 } 379 }
380 380
381 // Overridden from mojo::InterfaceFactory<mojo::ViewTreeClient>: 381 // Overridden from mojo::InterfaceFactory<mojo::ViewTreeClient>:
382 void Create( 382 void Create(
383 mojo::ApplicationConnection* connection, 383 mojo::ApplicationConnection* connection,
384 mojo::InterfaceRequest<mojo::ViewTreeClient> request) override { 384 mojo::InterfaceRequest<mojo::ViewTreeClient> request) override {
385 if (view_and_frame_) { 385 if (view_and_frame_) {
386 mus::ViewTreeConnection::Create(view_and_frame_.get(), request.Pass()); 386 mus::ViewTreeConnection::Create(
387 view_and_frame_.get(), request.Pass(),
388 mus::ViewTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
387 } else { 389 } else {
388 mus::ViewTreeConnection::Create(this, request.Pass()); 390 mus::ViewTreeConnection::Create(
391 this, request.Pass(),
392 mus::ViewTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
389 } 393 }
390 } 394 }
391 395
392 // Overridden from mojo::InterfaceFactory<mojom::FrameClient>: 396 // Overridden from mojo::InterfaceFactory<mojom::FrameClient>:
393 void Create(mojo::ApplicationConnection* connection, 397 void Create(mojo::ApplicationConnection* connection,
394 mojo::InterfaceRequest<mojom::FrameClient> request) override { 398 mojo::InterfaceRequest<mojom::FrameClient> request) override {
395 ASSERT_TRUE(view_and_frame_); 399 ASSERT_TRUE(view_and_frame_);
396 view_and_frame_->Bind(request.Pass()); 400 view_and_frame_->Bind(request.Pass());
397 } 401 }
398 402
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 child_view_and_frame->server_frame()->DispatchLoadEventToParent(); 526 child_view_and_frame->server_frame()->DispatchLoadEventToParent();
523 527
524 run_loop.Run(); 528 run_loop.Run();
525 529
526 uint32_t frame_id = root_view_and_frame() 530 uint32_t frame_id = root_view_and_frame()
527 ->test_frame_client() 531 ->test_frame_client()
528 ->last_dispatch_load_event_frame_id(); 532 ->last_dispatch_load_event_frame_id();
529 EXPECT_EQ(child_frame_id, frame_id); 533 EXPECT_EQ(child_frame_id, frame_id);
530 } 534 }
531 } // namespace web_view 535 } // namespace web_view
OLDNEW
« no previous file with comments | « components/pdf_viewer/pdf_viewer.cc ('k') | components/web_view/web_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698