← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mir/utopic-proposed

« back to all changes in this revision

Viewing changes to src/client/default_connection_configuration.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2013-08-07 06:10:58 UTC
  • mto: This revision was merged to the branch mainline in revision 8.
  • Revision ID: package-import@ubuntu.com-20130807061058-96qv8oz6o40xvvne
Tags: upstream-0.0.8+13.10.20130807.1
Import upstream version 0.0.8+13.10.20130807.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/default_connection_configuration.cpp
18
18
 
19
19
#include "default_connection_configuration.h"
20
20
 
 
21
#include "display_configuration.h"
21
22
#include "rpc/make_rpc_channel.h"
22
23
#include "rpc/null_rpc_report.h"
23
24
#include "mir/logging/dumb_console_logger.h"
58
59
        [this]
59
60
        {
60
61
            return mcl::rpc::make_rpc_channel(
61
 
                the_socket_file(), the_surface_map(), the_rpc_report());
 
62
                the_socket_file(), the_surface_map(), the_display_configuration(), the_rpc_report());
62
63
        });
63
64
}
64
65
 
115
116
                return std::make_shared<mcl::rpc::NullRpcReport>();
116
117
        });
117
118
}
 
119
 
 
120
std::shared_ptr<mcl::DisplayConfiguration> mcl::DefaultConnectionConfiguration::the_display_configuration()
 
121
{
 
122
    return display_configuration(
 
123
        []
 
124
        {
 
125
            return std::make_shared<mcl::DisplayConfiguration>();
 
126
        });
 
127
}