Index: components/html_viewer/html_widget.cc |
diff --git a/components/html_viewer/html_widget.cc b/components/html_viewer/html_widget.cc |
index ce5f4235e1cdd6b618539ec1820106f69668540f..570cc7ec53f9ec8a40feb93dd6ab7d84479066d3 100644 |
--- a/components/html_viewer/html_widget.cc |
+++ b/components/html_viewer/html_widget.cc |
@@ -28,7 +28,7 @@ scoped_ptr<WebLayerTreeViewImpl> CreateWebLayerTreeView( |
void InitializeWebLayerTreeView(WebLayerTreeViewImpl* web_layer_tree_view, |
mojo::ApplicationImpl* app, |
- mojo::View* view, |
+ mus::View* view, |
blink::WebWidget* widget) { |
DCHECK(view); |
mojo::URLRequestPtr request(mojo::URLRequest::New()); |
@@ -38,7 +38,7 @@ void InitializeWebLayerTreeView(WebLayerTreeViewImpl* web_layer_tree_view, |
web_layer_tree_view->Initialize(gpu_service.Pass(), view, widget); |
} |
-void UpdateWebViewSizeFromViewSize(mojo::View* view, |
+void UpdateWebViewSizeFromViewSize(mus::View* view, |
blink::WebWidget* web_widget, |
WebLayerTreeViewImpl* web_layer_tree_view) { |
const gfx::Size size_in_pixels(view->bounds().width, view->bounds().height); |
@@ -72,13 +72,13 @@ blink::WebWidget* HTMLWidgetRootRemote::GetWidget() { |
return web_view_; |
} |
-void HTMLWidgetRootRemote::OnViewBoundsChanged(mojo::View* view) {} |
+void HTMLWidgetRootRemote::OnViewBoundsChanged(mus::View* view) {} |
// HTMLWidgetRootLocal -------------------------------------------------------- |
HTMLWidgetRootLocal::CreateParams::CreateParams(mojo::ApplicationImpl* app, |
GlobalState* global_state, |
- mojo::View* view) |
+ mus::View* view) |
: app(app), global_state(global_state), view(view) {} |
HTMLWidgetRootLocal::CreateParams::~CreateParams() {} |
@@ -139,7 +139,7 @@ blink::WebWidget* HTMLWidgetRootLocal::GetWidget() { |
return web_view_; |
} |
-void HTMLWidgetRootLocal::OnViewBoundsChanged(mojo::View* view) { |
+void HTMLWidgetRootLocal::OnViewBoundsChanged(mus::View* view) { |
UpdateWebViewSizeFromViewSize(view, web_view_, |
web_layer_tree_view_impl_.get()); |
} |
@@ -148,7 +148,7 @@ void HTMLWidgetRootLocal::OnViewBoundsChanged(mojo::View* view) { |
HTMLWidgetLocalRoot::HTMLWidgetLocalRoot(mojo::ApplicationImpl* app, |
GlobalState* global_state, |
- mojo::View* view, |
+ mus::View* view, |
blink::WebLocalFrame* web_local_frame) |
: app_(app), global_state_(global_state), web_frame_widget_(nullptr) { |
web_frame_widget_ = blink::WebFrameWidget::create(this, web_local_frame); |
@@ -171,7 +171,7 @@ blink::WebWidget* HTMLWidgetLocalRoot::GetWidget() { |
return web_frame_widget_; |
} |
-void HTMLWidgetLocalRoot::OnViewBoundsChanged(mojo::View* view) { |
+void HTMLWidgetLocalRoot::OnViewBoundsChanged(mus::View* view) { |
UpdateWebViewSizeFromViewSize(view, web_frame_widget_, |
web_layer_tree_view_impl_.get()); |
} |