OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "mojo/shell/context.h" | 5 #include "mojo/shell/context.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 virtual bool ConfigureIncomingConnection( | 136 virtual bool ConfigureIncomingConnection( |
137 mojo::ApplicationConnection* connection) OVERRIDE { | 137 mojo::ApplicationConnection* connection) OVERRIDE { |
138 connection->AddService<NativeViewport>(this); | 138 connection->AddService<NativeViewport>(this); |
139 connection->AddService<Gpu>(this); | 139 connection->AddService<Gpu>(this); |
140 return true; | 140 return true; |
141 } | 141 } |
142 | 142 |
143 // InterfaceFactory<NativeViewport> implementation. | 143 // InterfaceFactory<NativeViewport> implementation. |
144 virtual void Create(ApplicationConnection* connection, | 144 virtual void Create(ApplicationConnection* connection, |
145 InterfaceRequest<NativeViewport> request) OVERRIDE { | 145 InterfaceRequest<NativeViewport> request) OVERRIDE { |
146 BindToRequest(new NativeViewportImpl(app_.get()), &request); | 146 BindToRequest(new NativeViewportImpl(app_.get(), false), &request); |
147 } | 147 } |
148 | 148 |
149 // InterfaceFactory<Gpu> implementation. | 149 // InterfaceFactory<Gpu> implementation. |
150 virtual void Create(ApplicationConnection* connection, | 150 virtual void Create(ApplicationConnection* connection, |
151 InterfaceRequest<Gpu> request) OVERRIDE { | 151 InterfaceRequest<Gpu> request) OVERRIDE { |
152 BindToRequest(new GpuImpl(share_group_.get(), mailbox_manager_.get()), | 152 BindToRequest(new GpuImpl(share_group_.get(), mailbox_manager_.get()), |
153 &request); | 153 &request); |
154 } | 154 } |
155 | 155 |
156 scoped_refptr<gfx::GLShareGroup> share_group_; | 156 scoped_refptr<gfx::GLShareGroup> share_group_; |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 ScopedMessagePipeHandle Context::ConnectToServiceByName( | 247 ScopedMessagePipeHandle Context::ConnectToServiceByName( |
248 const GURL& application_url, | 248 const GURL& application_url, |
249 const std::string& service_name) { | 249 const std::string& service_name) { |
250 app_urls_.insert(application_url); | 250 app_urls_.insert(application_url); |
251 return application_manager_.ConnectToServiceByName( | 251 return application_manager_.ConnectToServiceByName( |
252 application_url, service_name).Pass(); | 252 application_url, service_name).Pass(); |
253 } | 253 } |
254 | 254 |
255 } // namespace shell | 255 } // namespace shell |
256 } // namespace mojo | 256 } // namespace mojo |
OLD | NEW |