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

Side by Side Diff: components/mus/view_tree_apptest.cc

Issue 1345783002: Updates mojo:view_manager -> mojo:mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "components/mus/ids.h" 9 #include "components/mus/ids.h"
10 #include "components/mus/public/interfaces/view_tree.mojom.h" 10 #include "components/mus/public/interfaces/view_tree.mojom.h"
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 *connection_id = (*client->tracker()->changes())[0].connection_id; 506 *connection_id = (*client->tracker()->changes())[0].connection_id;
507 return client.Pass(); 507 return client.Pass();
508 } 508 }
509 509
510 // ApplicationTestBase: 510 // ApplicationTestBase:
511 ApplicationDelegate* GetApplicationDelegate() override { return this; } 511 ApplicationDelegate* GetApplicationDelegate() override { return this; }
512 void SetUp() override { 512 void SetUp() override {
513 ApplicationTestBase::SetUp(); 513 ApplicationTestBase::SetUp();
514 client_factory_.reset(new ViewTreeClientFactory(application_impl())); 514 client_factory_.reset(new ViewTreeClientFactory(application_impl()));
515 mojo::URLRequestPtr request(mojo::URLRequest::New()); 515 mojo::URLRequestPtr request(mojo::URLRequest::New());
516 request->url = mojo::String::From("mojo:view_manager"); 516 request->url = mojo::String::From("mojo:mus");
517 517
518 mojo::ViewTreeHostFactoryPtr factory; 518 mojo::ViewTreeHostFactoryPtr factory;
519 application_impl()->ConnectToService(request.Pass(), &factory); 519 application_impl()->ConnectToService(request.Pass(), &factory);
520 520
521 mojo::ViewTreeClientPtr tree_client_ptr; 521 mojo::ViewTreeClientPtr tree_client_ptr;
522 vm_client1_.reset(new ViewTreeClientImpl(application_impl())); 522 vm_client1_.reset(new ViewTreeClientImpl(application_impl()));
523 vm_client1_->Bind(GetProxy(&tree_client_ptr)); 523 vm_client1_->Bind(GetProxy(&tree_client_ptr));
524 524
525 factory->CreateViewTreeHost(GetProxy(&host_), mojo::ViewTreeHostClientPtr(), 525 factory->CreateViewTreeHost(GetProxy(&host_), mojo::ViewTreeHostClientPtr(),
526 tree_client_ptr.Pass()); 526 tree_client_ptr.Pass());
(...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1656 // TODO(sky): need to better track changes to initial connection. For example, 1656 // TODO(sky): need to better track changes to initial connection. For example,
1657 // that SetBounsdViews/AddView and the like don't result in messages to the 1657 // that SetBounsdViews/AddView and the like don't result in messages to the
1658 // originating connection. 1658 // originating connection.
1659 1659
1660 // TODO(sky): make sure coverage of what was 1660 // TODO(sky): make sure coverage of what was
1661 // ViewManagerTest.SecondEmbedRoot_InitService and 1661 // ViewManagerTest.SecondEmbedRoot_InitService and
1662 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager 1662 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager
1663 // tests. 1663 // tests.
1664 1664
1665 } // namespace view_manager 1665 } // namespace view_manager
OLDNEW
« no previous file with comments | « components/mus/public/cpp/lib/view_tree_host_factory.cc ('k') | components/pdf_viewer/pdf_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698