| 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 "view_manager/public/cpp/view.h" | 5 #include "view_manager/public/cpp/view.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "mojo/public/cpp/application/service_provider_impl.h" | 10 #include "mojo/public/cpp/application/service_provider_impl.h" |
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 static_cast<ViewManagerClientImpl*>(manager_)->Embed(url, id_); | 372 static_cast<ViewManagerClientImpl*>(manager_)->Embed(url, id_); |
| 373 } | 373 } |
| 374 | 374 |
| 375 void View::Embed(const String& url, | 375 void View::Embed(const String& url, |
| 376 InterfaceRequest<ServiceProvider> services, | 376 InterfaceRequest<ServiceProvider> services, |
| 377 ServiceProviderPtr exposed_services) { | 377 ServiceProviderPtr exposed_services) { |
| 378 static_cast<ViewManagerClientImpl*>(manager_) | 378 static_cast<ViewManagerClientImpl*>(manager_) |
| 379 ->Embed(url, id_, services.Pass(), exposed_services.Pass()); | 379 ->Embed(url, id_, services.Pass(), exposed_services.Pass()); |
| 380 } | 380 } |
| 381 | 381 |
| 382 void View::Embed(ViewManagerClientPtr client) { |
| 383 static_cast<ViewManagerClientImpl*>(manager_)->Embed(id_, client.Pass()); |
| 384 } |
| 385 |
| 382 //////////////////////////////////////////////////////////////////////////////// | 386 //////////////////////////////////////////////////////////////////////////////// |
| 383 // View, protected: | 387 // View, protected: |
| 384 | 388 |
| 385 namespace { | 389 namespace { |
| 386 | 390 |
| 387 ViewportMetricsPtr CreateEmptyViewportMetrics() { | 391 ViewportMetricsPtr CreateEmptyViewportMetrics() { |
| 388 ViewportMetricsPtr metrics = ViewportMetrics::New(); | 392 ViewportMetricsPtr metrics = ViewportMetrics::New(); |
| 389 metrics->size = Size::New(); | 393 metrics->size = Size::New(); |
| 390 // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove it | 394 // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove it |
| 391 // once that's fixed. | 395 // once that's fixed. |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 void View::NotifyViewVisibilityChangedUp(View* target) { | 573 void View::NotifyViewVisibilityChangedUp(View* target) { |
| 570 // Start with the parent as we already notified |this| | 574 // Start with the parent as we already notified |this| |
| 571 // in NotifyViewVisibilityChangedDown. | 575 // in NotifyViewVisibilityChangedDown. |
| 572 for (View* view = parent(); view; view = view->parent()) { | 576 for (View* view = parent(); view; view = view->parent()) { |
| 573 bool ret = view->NotifyViewVisibilityChangedAtReceiver(target); | 577 bool ret = view->NotifyViewVisibilityChangedAtReceiver(target); |
| 574 DCHECK(ret); | 578 DCHECK(ret); |
| 575 } | 579 } |
| 576 } | 580 } |
| 577 | 581 |
| 578 } // namespace mojo | 582 } // namespace mojo |
| OLD | NEW |