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/view_manager/display_manager.h" | 5 #include "services/view_manager/display_manager.h" |
6 | 6 |
7 #include "base/numerics/safe_conversions.h" | 7 #include "base/numerics/safe_conversions.h" |
8 #include "mojo/converters/geometry/geometry_type_converters.h" | 8 #include "mojo/converters/geometry/geometry_type_converters.h" |
9 #include "mojo/converters/surfaces/surfaces_type_converters.h" | 9 #include "mojo/converters/surfaces/surfaces_type_converters.h" |
10 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 metrics_.size->width = 800; | 86 metrics_.size->width = 800; |
87 metrics_.size->height = 600; | 87 metrics_.size->height = 600; |
88 } | 88 } |
89 | 89 |
90 void DefaultDisplayManager::Init(ConnectionManager* connection_manager) { | 90 void DefaultDisplayManager::Init(ConnectionManager* connection_manager) { |
91 connection_manager_ = connection_manager; | 91 connection_manager_ = connection_manager; |
92 app_impl_->ConnectToService("mojo:native_viewport_service", | 92 app_impl_->ConnectToService("mojo:native_viewport_service", |
93 &native_viewport_); | 93 &native_viewport_); |
94 native_viewport_.set_error_handler(this); | 94 native_viewport_.set_error_handler(this); |
95 native_viewport_->Create(metrics_.size->Clone(), | 95 native_viewport_->Create(metrics_.size->Clone(), |
| 96 mojo::SurfaceConfiguration::New(), |
96 base::Bind(&DefaultDisplayManager::OnMetricsChanged, | 97 base::Bind(&DefaultDisplayManager::OnMetricsChanged, |
97 weak_factory_.GetWeakPtr())); | 98 weak_factory_.GetWeakPtr())); |
98 native_viewport_->Show(); | 99 native_viewport_->Show(); |
99 | 100 |
100 mojo::ContextProviderPtr context_provider; | 101 mojo::ContextProviderPtr context_provider; |
101 native_viewport_->GetContextProvider(GetProxy(&context_provider)); | 102 native_viewport_->GetContextProvider(GetProxy(&context_provider)); |
102 mojo::DisplayFactoryPtr display_factory; | 103 mojo::DisplayFactoryPtr display_factory; |
103 app_impl_->ConnectToService("mojo:surfaces_service", &display_factory); | 104 app_impl_->ConnectToService("mojo:surfaces_service", &display_factory); |
104 display_factory->Create(context_provider.Pass(), | 105 display_factory->Create(context_provider.Pass(), |
105 nullptr, // returner - we never submit resources. | 106 nullptr, // returner - we never submit resources. |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 &DefaultDisplayManager::OnMetricsChanged, weak_factory_.GetWeakPtr())); | 178 &DefaultDisplayManager::OnMetricsChanged, weak_factory_.GetWeakPtr())); |
178 } | 179 } |
179 | 180 |
180 void DefaultDisplayManager::OnConnectionError() { | 181 void DefaultDisplayManager::OnConnectionError() { |
181 // This is called when the native_viewport is torn down before | 182 // This is called when the native_viewport is torn down before |
182 // ~DefaultDisplayManager may be called. | 183 // ~DefaultDisplayManager may be called. |
183 native_viewport_closed_callback_.Run(); | 184 native_viewport_closed_callback_.Run(); |
184 } | 185 } |
185 | 186 |
186 } // namespace view_manager | 187 } // namespace view_manager |
OLD | NEW |