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

Unified Diff: components/html_viewer/html_widget.cc

Issue 1340983002: Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased 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
« no previous file with comments | « components/html_viewer/html_widget.h ('k') | components/html_viewer/ime_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/html_widget.cc
diff --git a/components/html_viewer/html_widget.cc b/components/html_viewer/html_widget.cc
index 24426571a990c4a15b6ff6ad2a9b602a0539874e..aacfcacd52b1443f1d788b1af1dcd8f4c0b53755 100644
--- a/components/html_viewer/html_widget.cc
+++ b/components/html_viewer/html_widget.cc
@@ -33,7 +33,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());
@@ -43,7 +43,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);
@@ -81,13 +81,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() {}
@@ -160,7 +160,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());
}
@@ -169,7 +169,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);
@@ -192,7 +192,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());
}
« no previous file with comments | « components/html_viewer/html_widget.h ('k') | components/html_viewer/ime_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698