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

Unified Diff: components/web_view/web_view_impl.cc

Issue 1414663002: Mandoline webview: View => Window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More renaming Created 5 years, 2 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/web_view/web_view_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/web_view/web_view_impl.cc
diff --git a/components/web_view/web_view_impl.cc b/components/web_view/web_view_impl.cc
index 49e41b84855a7f392895cd2769254f883275cd84..86abed119864294b66bc5208ec0d6cff10ea1402 100644
--- a/components/web_view/web_view_impl.cc
+++ b/components/web_view/web_view_impl.cc
@@ -64,8 +64,8 @@ WebViewImpl::~WebViewImpl() {
}
void WebViewImpl::OnLoad(const GURL& pending_url) {
- // Frames are uniqued based on the id of the associated View. By creating a
- // new View each time through we ensure the renderers get a clean id, rather
+ // Frames are uniqued based on the id of the associated Window. By creating a
+ // new Window each time through we ensure the renderers get a clean id, rather
// than one they may know about and try to incorrectly use.
if (content_) {
content_->Destroy();
@@ -164,12 +164,12 @@ void WebViewImpl::OnConnectionLost(mus::WindowTreeConnection* connection) {
}
////////////////////////////////////////////////////////////////////////////////
-// WebViewImpl, mus::ViewObserver implementation:
+// WebViewImpl, mus::WindowObserver implementation:
-void WebViewImpl::OnWindowBoundsChanged(mus::Window* view,
+void WebViewImpl::OnWindowBoundsChanged(mus::Window* window,
const mojo::Rect& old_bounds,
const mojo::Rect& new_bounds) {
- if (view != content_) {
+ if (window != content_) {
mojo::Rect rect;
rect.width = new_bounds.width;
rect.height = new_bounds.height;
@@ -178,9 +178,9 @@ void WebViewImpl::OnWindowBoundsChanged(mus::Window* view,
}
}
-void WebViewImpl::OnWindowDestroyed(mus::Window* view) {
- // |FrameTree| cannot outlive the content view.
- if (view == content_) {
+void WebViewImpl::OnWindowDestroyed(mus::Window* window) {
+ // |FrameTree| cannot outlive the content window.
+ if (window == content_) {
frame_tree_.reset();
content_ = nullptr;
}
« no previous file with comments | « components/web_view/web_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698