OLD | NEW |
---|---|
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 "services/window_manager/window_manager_app.h" | 5 #include "services/window_manager/window_manager_app.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "mojo/converters/geometry/geometry_type_converters.h" | 9 #include "mojo/converters/geometry/geometry_type_converters.h" |
10 #include "mojo/converters/input_events/input_events_type_converters.h" | 10 #include "mojo/converters/input_events/input_events_type_converters.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
134 | 134 |
135 //////////////////////////////////////////////////////////////////////////////// | 135 //////////////////////////////////////////////////////////////////////////////// |
136 // WindowManagerApp, ApplicationDelegate implementation: | 136 // WindowManagerApp, ApplicationDelegate implementation: |
137 | 137 |
138 void WindowManagerApp::Initialize(mojo::ApplicationImpl* impl) { | 138 void WindowManagerApp::Initialize(mojo::ApplicationImpl* impl) { |
139 shell_ = impl->shell(); | 139 shell_ = impl->shell(); |
140 LaunchViewManager(impl); | 140 LaunchViewManager(impl); |
141 } | 141 } |
142 | 142 |
143 bool WindowManagerApp::ConfigureIncomingConnection( | 143 bool WindowManagerApp::ConfigureIncomingConnection( |
144 ApplicationConnection* connection) { | 144 ApplicationConnection* connection, |
qsr
2015/02/27 17:15:58
Indenttion seems wrong. Did you run git cl format?
Aaron Boodman
2015/02/28 19:08:23
Done.
| |
145 const std::string& url) { | |
145 connection->AddService<WindowManager>(this); | 146 connection->AddService<WindowManager>(this); |
146 return true; | 147 return true; |
147 } | 148 } |
148 | 149 |
149 //////////////////////////////////////////////////////////////////////////////// | 150 //////////////////////////////////////////////////////////////////////////////// |
150 // WindowManagerApp, ViewManagerDelegate implementation: | 151 // WindowManagerApp, ViewManagerDelegate implementation: |
151 | 152 |
152 void WindowManagerApp::OnEmbed( | 153 void WindowManagerApp::OnEmbed( |
153 View* root, | 154 View* root, |
154 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 155 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
408 void WindowManagerApp::SetViewManagerClient( | 409 void WindowManagerApp::SetViewManagerClient( |
409 mojo::ScopedMessagePipeHandle view_manager_client_request) { | 410 mojo::ScopedMessagePipeHandle view_manager_client_request) { |
410 view_manager_client_.reset( | 411 view_manager_client_.reset( |
411 mojo::ViewManagerClientFactory::WeakBindViewManagerToPipe( | 412 mojo::ViewManagerClientFactory::WeakBindViewManagerToPipe( |
412 mojo::MakeRequest<mojo::ViewManagerClient>( | 413 mojo::MakeRequest<mojo::ViewManagerClient>( |
413 view_manager_client_request.Pass()), | 414 view_manager_client_request.Pass()), |
414 view_manager_service_.Pass(), shell_, this)); | 415 view_manager_service_.Pass(), shell_, this)); |
415 } | 416 } |
416 | 417 |
417 } // namespace window_manager | 418 } // namespace window_manager |
OLD | NEW |