← Back to branch summary

~mir-team/mir/trunk

« back to all changes in this revision

Viewing changes to src/client/mir_connection.cpp

  • Committer: Tarmac
  • Author(s): Alan Griffiths
  • Date: 2013-04-25 23:50:01 UTC
  • mfrom: (526.2.22 mir1)
  • Revision ID: tarmac-20130425235001-c3b3x2yyb3eldyx1
frontend, shell, tests: surface-states updated to avoid supplying dependencies through public member functions.

Approved by PS Jenkins bot, Chris Halse Rogers, Robert Ancell, Kevin DuBois.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/mir_connection.cpp
43
43
}
44
44
 
45
45
MirConnection::MirConnection(
46
 
    std::shared_ptr<google::protobuf::RpcChannel> const& channel,
 
46
    std::shared_ptr<mir::client::MirBasicRpcChannel> const& channel,
47
47
    std::shared_ptr<mcl::Logger> const & log,
48
48
    std::shared_ptr<mcl::ClientPlatformFactory> const& client_platform_factory) :
49
49
        channel(channel),
52
52
        client_platform_factory(client_platform_factory),
53
53
        input_platform(mcli::InputPlatform::create())
54
54
{
 
55
    channel->set_event_handler(this);
55
56
    {
56
57
        std::lock_guard<std::mutex> lock(connection_guard);
57
58
        valid_connections.insert(this);