Rename PopupType methods and variables to WidgetType.
The enum has changed to be WidgetType since it specifies essentially if
the widget is a Frame or a Popup.
The KeyEventRoutingKeyboardLockAndChildPopupWithoutInputGrab test goes
away as it was setting a RenderWidgetHostView to be a Frame, but then
doing InitAsPopup(), in order to make NeedsInputGrab() return false,
but these things do not happen together!
CreateViewForPopupWidget() is renamed to CreateViewForChildWidget() as
it is used to make either Frame or Popup child widgets, and is
different from CreateViewForWidget() which makes top-level widgets for
a tab.
[email protected], [email protected], [email protected]
Bug: 419087
Change-Id: Iab5856c5c934ab4204f63dd20a7b8f3d78668f84
Reviewed-on: https://chromium-review.googlesource.com/1227297
Commit-Queue: danakj <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Cr-Commit-Position: refs/heads/master@{#591825}diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index bb81a69..5d4b922 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2781,13 +2781,13 @@
RenderWidgetHostViewBase* widget_view =
static_cast<RenderWidgetHostViewBase*>(
- view_->CreateViewForPopupWidget(widget_host));
+ view_->CreateViewForChildWidget(widget_host));
if (!widget_view)
return;
- if (!is_fullscreen) {
- // Popups should not get activated.
- widget_view->SetPopupType(WidgetType::kPopup);
- }
+ // Fullscreen child widgets are frames, other child widgets are popups, and
+ // popups should not get activated.
+ if (!is_fullscreen)
+ widget_view->SetWidgetType(WidgetType::kPopup);
// Save the created widget associated with the route so we can show it later.
pending_widget_views_[GlobalRoutingID(render_process_id, route_id)] =
widget_view;
@@ -2851,6 +2851,7 @@
view = GetRenderWidgetHostView();
}
+ // Fullscreen child widgets are frames, other child widgets are popups.
if (is_fullscreen) {
DCHECK_EQ(MSG_ROUTING_NONE, fullscreen_widget_routing_id_);
view_->StoreFocus();
diff --git a/content/browser/web_contents/web_contents_view.h b/content/browser/web_contents/web_contents_view.h
index 41e44d5d..281a3d6 100644
--- a/content/browser/web_contents/web_contents_view.h
+++ b/content/browser/web_contents/web_contents_view.h
@@ -96,8 +96,9 @@
virtual RenderWidgetHostViewBase* CreateViewForWidget(
RenderWidgetHost* render_widget_host, bool is_guest_view_hack) = 0;
- // Creates a new View that holds a popup and receives messages for it.
- virtual RenderWidgetHostViewBase* CreateViewForPopupWidget(
+ // Creates a new View that holds a non-top-level widget and receives messages
+ // for it.
+ virtual RenderWidgetHostViewBase* CreateViewForChildWidget(
RenderWidgetHost* render_widget_host) = 0;
// Sets the page title for the native widgets corresponding to the view. This
diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
index fe977804..58f0a9d 100644
--- a/content/browser/web_contents/web_contents_view_android.cc
+++ b/content/browser/web_contents/web_contents_view_android.cc
@@ -255,7 +255,7 @@
return rwhv;
}
-RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForPopupWidget(
+RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForChildWidget(
RenderWidgetHost* render_widget_host) {
RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host);
return new RenderWidgetHostViewAndroid(rwhi, nullptr);
diff --git a/content/browser/web_contents/web_contents_view_android.h b/content/browser/web_contents/web_contents_view_android.h
index 53d1898..58bb78c 100644
--- a/content/browser/web_contents/web_contents_view_android.h
+++ b/content/browser/web_contents/web_contents_view_android.h
@@ -73,7 +73,7 @@
RenderWidgetHostViewBase* CreateViewForWidget(
RenderWidgetHost* render_widget_host,
bool is_guest_view_hack) override;
- RenderWidgetHostViewBase* CreateViewForPopupWidget(
+ RenderWidgetHostViewBase* CreateViewForChildWidget(
RenderWidgetHost* render_widget_host) override;
void SetPageTitle(const base::string16& title) override;
void RenderViewCreated(RenderViewHost* host) override;
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index e471459..5891aaa 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -852,7 +852,7 @@
return view;
}
-RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForPopupWidget(
+RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForChildWidget(
RenderWidgetHost* render_widget_host) {
// Popups are not created as embedded windows in mus, so
// |is_mus_browser_plugin_guest| is always false for them.
diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h
index 212da86..0c4a3d2 100644
--- a/content/browser/web_contents/web_contents_view_aura.h
+++ b/content/browser/web_contents/web_contents_view_aura.h
@@ -122,7 +122,7 @@
RenderWidgetHostViewBase* CreateViewForWidget(
RenderWidgetHost* render_widget_host,
bool is_guest_view_hack) override;
- RenderWidgetHostViewBase* CreateViewForPopupWidget(
+ RenderWidgetHostViewBase* CreateViewForChildWidget(
RenderWidgetHost* render_widget_host) override;
void SetPageTitle(const base::string16& title) override;
void RenderViewCreated(RenderViewHost* host) override;
diff --git a/content/browser/web_contents/web_contents_view_child_frame.cc b/content/browser/web_contents/web_contents_view_child_frame.cc
index 688540c..015812b 100644
--- a/content/browser/web_contents/web_contents_view_child_frame.cc
+++ b/content/browser/web_contents/web_contents_view_child_frame.cc
@@ -88,9 +88,9 @@
return RenderWidgetHostViewChildFrame::Create(render_widget_host);
}
-RenderWidgetHostViewBase* WebContentsViewChildFrame::CreateViewForPopupWidget(
+RenderWidgetHostViewBase* WebContentsViewChildFrame::CreateViewForChildWidget(
RenderWidgetHost* render_widget_host) {
- return GetOuterView()->CreateViewForPopupWidget(render_widget_host);
+ return GetOuterView()->CreateViewForChildWidget(render_widget_host);
}
void WebContentsViewChildFrame::SetPageTitle(const base::string16& title) {
diff --git a/content/browser/web_contents/web_contents_view_child_frame.h b/content/browser/web_contents/web_contents_view_child_frame.h
index e5485f56..7f7107e 100644
--- a/content/browser/web_contents/web_contents_view_child_frame.h
+++ b/content/browser/web_contents/web_contents_view_child_frame.h
@@ -41,7 +41,7 @@
RenderWidgetHostViewBase* CreateViewForWidget(
RenderWidgetHost* render_widget_host,
bool is_guest_view_hack) override;
- RenderWidgetHostViewBase* CreateViewForPopupWidget(
+ RenderWidgetHostViewBase* CreateViewForChildWidget(
RenderWidgetHost* render_widget_host) override;
void SetPageTitle(const base::string16& title) override;
void RenderViewCreated(RenderViewHost* host) override;
diff --git a/content/browser/web_contents/web_contents_view_guest.cc b/content/browser/web_contents/web_contents_view_guest.cc
index 12f6817..4b484a6 100644
--- a/content/browser/web_contents/web_contents_view_guest.cc
+++ b/content/browser/web_contents/web_contents_view_guest.cc
@@ -151,9 +151,9 @@
platform_widget->GetWeakPtr());
}
-RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForPopupWidget(
+RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForChildWidget(
RenderWidgetHost* render_widget_host) {
- return platform_view_->CreateViewForPopupWidget(render_widget_host);
+ return platform_view_->CreateViewForChildWidget(render_widget_host);
}
void WebContentsViewGuest::SetPageTitle(const base::string16& title) {
diff --git a/content/browser/web_contents/web_contents_view_guest.h b/content/browser/web_contents/web_contents_view_guest.h
index 9e3511a..b9691d9 100644
--- a/content/browser/web_contents/web_contents_view_guest.h
+++ b/content/browser/web_contents/web_contents_view_guest.h
@@ -59,7 +59,7 @@
RenderWidgetHostViewBase* CreateViewForWidget(
RenderWidgetHost* render_widget_host,
bool is_guest_view_hack) override;
- RenderWidgetHostViewBase* CreateViewForPopupWidget(
+ RenderWidgetHostViewBase* CreateViewForChildWidget(
RenderWidgetHost* render_widget_host) override;
void SetPageTitle(const base::string16& title) override;
void RenderViewCreated(RenderViewHost* host) override;
diff --git a/content/browser/web_contents/web_contents_view_mac.h b/content/browser/web_contents/web_contents_view_mac.h
index 7f80c1b..21b40228 100644
--- a/content/browser/web_contents/web_contents_view_mac.h
+++ b/content/browser/web_contents/web_contents_view_mac.h
@@ -98,7 +98,7 @@
RenderWidgetHostViewBase* CreateViewForWidget(
RenderWidgetHost* render_widget_host,
bool is_guest_view_hack) override;
- RenderWidgetHostViewBase* CreateViewForPopupWidget(
+ RenderWidgetHostViewBase* CreateViewForChildWidget(
RenderWidgetHost* render_widget_host) override;
void SetPageTitle(const base::string16& title) override;
void RenderViewCreated(RenderViewHost* host) override;
diff --git a/content/browser/web_contents/web_contents_view_mac.mm b/content/browser/web_contents/web_contents_view_mac.mm
index 94848b56..cb6b58f 100644
--- a/content/browser/web_contents/web_contents_view_mac.mm
+++ b/content/browser/web_contents/web_contents_view_mac.mm
@@ -397,7 +397,7 @@
return view;
}
-RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForPopupWidget(
+RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForChildWidget(
RenderWidgetHost* render_widget_host) {
RenderWidgetHostViewMac* view =
new RenderWidgetHostViewMac(render_widget_host, false);
