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

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

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased 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
« no previous file with comments | « components/mus/client_connection.h ('k') | components/mus/connection_manager.h » ('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 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 "components/view_manager/client_connection.h" 5 #include "components/mus/client_connection.h"
6 6
7 #include "components/view_manager/connection_manager.h" 7 #include "components/mus/connection_manager.h"
8 #include "components/view_manager/view_tree_impl.h" 8 #include "components/mus/view_tree_impl.h"
9 9
10 namespace view_manager { 10 namespace view_manager {
11 11
12 ClientConnection::ClientConnection(scoped_ptr<ViewTreeImpl> service, 12 ClientConnection::ClientConnection(scoped_ptr<ViewTreeImpl> service,
13 mojo::ViewTreeClient* client) 13 mojo::ViewTreeClient* client)
14 : service_(service.Pass()), client_(client) { 14 : service_(service.Pass()), client_(client) {}
15 }
16 15
17 ClientConnection::~ClientConnection() { 16 ClientConnection::~ClientConnection() {}
18 }
19 17
20 DefaultClientConnection::DefaultClientConnection( 18 DefaultClientConnection::DefaultClientConnection(
21 scoped_ptr<ViewTreeImpl> service_impl, 19 scoped_ptr<ViewTreeImpl> service_impl,
22 ConnectionManager* connection_manager, 20 ConnectionManager* connection_manager,
23 mojo::InterfaceRequest<mojo::ViewTree> service_request, 21 mojo::InterfaceRequest<mojo::ViewTree> service_request,
24 mojo::ViewTreeClientPtr client) 22 mojo::ViewTreeClientPtr client)
25 : ClientConnection(service_impl.Pass(), client.get()), 23 : ClientConnection(service_impl.Pass(), client.get()),
26 connection_manager_(connection_manager), 24 connection_manager_(connection_manager),
27 binding_(service(), service_request.Pass()), 25 binding_(service(), service_request.Pass()),
28 client_(client.Pass()) { 26 client_(client.Pass()) {
29 binding_.set_connection_error_handler( 27 binding_.set_connection_error_handler(
30 [this]() { connection_manager_->OnConnectionError(this); }); 28 [this]() { connection_manager_->OnConnectionError(this); });
31 } 29 }
32 30
33 DefaultClientConnection::~DefaultClientConnection() { 31 DefaultClientConnection::~DefaultClientConnection() {}
34 }
35 32
36 } // namespace view_manager 33 } // namespace view_manager
OLDNEW
« no previous file with comments | « components/mus/client_connection.h ('k') | components/mus/connection_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698