| 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 "components/view_manager/public/cpp/view.h" | 5 #include "components/view_manager/public/cpp/view.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "components/view_manager/public/cpp/lib/view_manager_client_impl.h" | 10 #include "components/view_manager/public/cpp/lib/view_manager_client_impl.h" |
| (...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 | 363 |
| 364 void View::SetFocus() { | 364 void View::SetFocus() { |
| 365 if (manager_) | 365 if (manager_) |
| 366 static_cast<ViewManagerClientImpl*>(manager_)->SetFocus(id_); | 366 static_cast<ViewManagerClientImpl*>(manager_)->SetFocus(id_); |
| 367 } | 367 } |
| 368 | 368 |
| 369 void View::Embed(const String& url) { | 369 void View::Embed(const String& url) { |
| 370 static_cast<ViewManagerClientImpl*>(manager_)->Embed(url, id_); | 370 static_cast<ViewManagerClientImpl*>(manager_)->Embed(url, id_); |
| 371 } | 371 } |
| 372 | 372 |
| 373 void View::Embed(const String& url, | 373 void View::Embed(mojo::URLRequestPtr request, |
| 374 InterfaceRequest<ServiceProvider> services, | 374 InterfaceRequest<ServiceProvider> services, |
| 375 ServiceProviderPtr exposed_services) { | 375 ServiceProviderPtr exposed_services) { |
| 376 static_cast<ViewManagerClientImpl*>(manager_) | 376 static_cast<ViewManagerClientImpl*>(manager_) |
| 377 ->Embed(url, id_, services.Pass(), exposed_services.Pass()); | 377 ->Embed(request.Pass(), id_, services.Pass(), exposed_services.Pass()); |
| 378 } | 378 } |
| 379 | 379 |
| 380 void View::Embed(ViewManagerClientPtr client) { | 380 void View::Embed(ViewManagerClientPtr client) { |
| 381 static_cast<ViewManagerClientImpl*>(manager_)->Embed(id_, client.Pass()); | 381 static_cast<ViewManagerClientImpl*>(manager_)->Embed(id_, client.Pass()); |
| 382 } | 382 } |
| 383 | 383 |
| 384 //////////////////////////////////////////////////////////////////////////////// | 384 //////////////////////////////////////////////////////////////////////////////// |
| 385 // View, protected: | 385 // View, protected: |
| 386 | 386 |
| 387 namespace { | 387 namespace { |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 void View::NotifyViewVisibilityChangedUp(View* target) { | 580 void View::NotifyViewVisibilityChangedUp(View* target) { |
| 581 // Start with the parent as we already notified |this| | 581 // Start with the parent as we already notified |this| |
| 582 // in NotifyViewVisibilityChangedDown. | 582 // in NotifyViewVisibilityChangedDown. |
| 583 for (View* view = parent(); view; view = view->parent()) { | 583 for (View* view = parent(); view; view = view->parent()) { |
| 584 bool ret = view->NotifyViewVisibilityChangedAtReceiver(target); | 584 bool ret = view->NotifyViewVisibilityChangedAtReceiver(target); |
| 585 DCHECK(ret); | 585 DCHECK(ret); |
| 586 } | 586 } |
| 587 } | 587 } |
| 588 | 588 |
| 589 } // namespace mojo | 589 } // namespace mojo |
| OLD | NEW |