Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Unified Diff: services/view_manager/view_manager_service_impl.cc

Issue 1327033004: Allow building mojo_shell and non-graphical apps/services on a Mac (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: services/view_manager/view_manager_service_impl.cc
diff --git a/services/view_manager/view_manager_service_impl.cc b/services/view_manager/view_manager_service_impl.cc
index 6114d9482c60c6261e84c84cab448013779bf3db..166c4e2a8b1c31c505b5d6f9b97e2bb9f18fce73 100644
--- a/services/view_manager/view_manager_service_impl.cc
+++ b/services/view_manager/view_manager_service_impl.cc
@@ -21,7 +21,6 @@ using mojo::Callback;
using mojo::Id;
using mojo::InterfaceRequest;
using mojo::OrderDirection;
-using mojo::Rect;
viettrungluu 2015/09/10 18:11:09 "
using mojo::ServiceProvider;
using mojo::ServiceProviderPtr;
using mojo::String;
@@ -168,8 +167,8 @@ void ViewManagerServiceImpl::ProcessViewBoundsChanged(
if (originated_change || !IsViewKnown(view))
return;
client()->OnViewBoundsChanged(ViewIdToTransportId(view->id()),
- Rect::From(old_bounds),
- Rect::From(new_bounds));
+ mojo::Rect::From(old_bounds),
+ mojo::Rect::From(new_bounds));
}
void ViewManagerServiceImpl::ProcessViewportMetricsChanged(
@@ -416,7 +415,7 @@ ViewDataPtr ViewManagerServiceImpl::ViewToViewData(const ServerView* view) {
ViewDataPtr view_data(mojo::ViewData::New());
view_data->parent_id = ViewIdToTransportId(parent ? parent->id() : ViewId());
view_data->view_id = ViewIdToTransportId(view->id());
- view_data->bounds = Rect::From(view->bounds());
+ view_data->bounds = mojo::Rect::From(view->bounds());
view_data->properties =
mojo::Map<String, Array<uint8_t>>::From(view->properties());
view_data->visible = view->visible();

Powered by Google App Engine
This is Rietveld 408576698