| 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/mus/server_view.h" | 5 #include "components/mus/server_view.h" |
| 6 | 6 |
| 7 #include <inttypes.h> | 7 #include <inttypes.h> |
| 8 | 8 |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "components/mus/server_view_delegate.h" | 10 #include "components/mus/server_view_delegate.h" |
| 11 #include "components/mus/server_view_observer.h" | 11 #include "components/mus/server_view_observer.h" |
| 12 #include "components/mus/surfaces/surfaces_state.h" | 12 #include "components/mus/surfaces/surfaces_state.h" |
| 13 #include "mojo/converters/geometry/geometry_type_converters.h" | 13 #include "mojo/converters/geometry/geometry_type_converters.h" |
| 14 #include "mojo/converters/surfaces/surfaces_type_converters.h" | 14 #include "mojo/converters/surfaces/surfaces_type_converters.h" |
| 15 | 15 |
| 16 namespace view_manager { | 16 namespace mus { |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| 20 void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) { | 20 void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) { |
| 21 callback.Run(); | 21 callback.Run(); |
| 22 } | 22 } |
| 23 | 23 |
| 24 } // namespace | 24 } // namespace |
| 25 | 25 |
| 26 ServerView::ServerView(ServerViewDelegate* delegate, const ViewId& id) | 26 ServerView::ServerView(ServerViewDelegate* delegate, const ViewId& id) |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 return; | 304 return; |
| 305 client_->ReturnResources( | 305 client_->ReturnResources( |
| 306 mojo::Array<mojo::ReturnedResourcePtr>::From(resources)); | 306 mojo::Array<mojo::ReturnedResourcePtr>::From(resources)); |
| 307 } | 307 } |
| 308 | 308 |
| 309 void ServerView::RemoveImpl(ServerView* view) { | 309 void ServerView::RemoveImpl(ServerView* view) { |
| 310 view->parent_ = NULL; | 310 view->parent_ = NULL; |
| 311 children_.erase(std::find(children_.begin(), children_.end(), view)); | 311 children_.erase(std::find(children_.begin(), children_.end(), view)); |
| 312 } | 312 } |
| 313 | 313 |
| 314 } // namespace view_manager | 314 } // namespace mus |
| OLD | NEW |