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

Unified Diff: content/browser/renderer_host/render_widget_host_view_base.cc

Issue 9347042: Introduce content::RenderWidgetHostViewPort (in content/port/browser). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head. Created 8 years, 10 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: content/browser/renderer_host/render_widget_host_view_base.cc
diff --git a/content/browser/renderer_host/render_widget_host_view.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
similarity index 81%
rename from content/browser/renderer_host/render_widget_host_view.cc
rename to content/browser/renderer_host/render_widget_host_view_base.cc
index 83cc1b790d2255206f5fae43a9247c1bc2271e10..a85b7e5b0a4418c531de94634f632392aec849b4 100644
--- a/content/browser/renderer_host/render_widget_host_view.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -15,10 +15,18 @@
#include "content/browser/renderer_host/gtk_window_utils.h"
#endif
-RenderWidgetHostView::RenderWidgetHostView() {
+namespace content {
+
+// static
+RenderWidgetHostViewPort* RenderWidgetHostViewPort::FromRWHV(
+ RenderWidgetHostView* rwhv) {
+ return static_cast<RenderWidgetHostViewPort*>(rwhv);
}
-RenderWidgetHostView::~RenderWidgetHostView() {
+// static
+RenderWidgetHostViewPort* RenderWidgetHostViewPort::CreateViewForWidget(
+ RenderWidgetHost* widget) {
+ return FromRWHV(RenderWidgetHostView::CreateViewForWidget(widget));
}
RenderWidgetHostViewBase::RenderWidgetHostViewBase()
@@ -33,18 +41,6 @@ RenderWidgetHostViewBase::~RenderWidgetHostViewBase() {
DCHECK(!mouse_locked_);
}
-// static
-RenderWidgetHostViewBase* RenderWidgetHostViewBase::FromRWHV(
- RenderWidgetHostView* rwhv) {
- return static_cast<RenderWidgetHostViewBase*>(rwhv);
-}
-
-// static
-RenderWidgetHostViewBase* RenderWidgetHostViewBase::CreateViewForWidget(
- RenderWidgetHost* widget) {
- return FromRWHV(RenderWidgetHostView::CreateViewForWidget(widget));
-}
-
void RenderWidgetHostViewBase::SetBackground(const SkBitmap& background) {
background_ = background;
}
@@ -80,3 +76,17 @@ void RenderWidgetHostViewBase::SetShowingContextMenu(bool showing) {
DCHECK_NE(showing_context_menu_, showing);
showing_context_menu_ = showing;
}
+
+bool RenderWidgetHostViewBase::IsMouseLocked() {
+ return mouse_locked_;
+}
+
+void RenderWidgetHostViewBase::SetPopupType(WebKit::WebPopupType popup_type) {
+ popup_type_ = popup_type;
+}
+
+WebKit::WebPopupType RenderWidgetHostViewBase::GetPopupType() {
+ return popup_type_;
+}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698