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

Unified Diff: chrome/browser/ui/views/extensions/extension_view.cc

Issue 8587001: Have ExtensionHost use TabContents instead of RenderViewHost. Try #3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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: chrome/browser/ui/views/extensions/extension_view.cc
diff --git a/chrome/browser/ui/views/extensions/extension_view.cc b/chrome/browser/ui/views/extensions/extension_view.cc
index 62f1292e0fe638a46725d2a2b663f4faf5b501da..01ae823b9da7b8b055f799ab8581187d3972ad15 100644
--- a/chrome/browser/ui/views/extensions/extension_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_view.cc
@@ -8,19 +8,11 @@
#include "chrome/browser/ui/views/extensions/extension_popup.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_widget_host_view.h"
+#include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/tab_contents_view.h"
#include "content/public/browser/content_browser_client.h"
#include "views/widget/widget.h"
-#if defined(USE_AURA)
-#include "content/browser/renderer_host/render_widget_host_view_aura.h"
-#elif defined(TOUCH_UI)
-#include "chrome/browser/renderer_host/render_widget_host_view_views.h"
-#elif defined(TOOLKIT_USES_GTK)
-#include "content/browser/renderer_host/render_widget_host_view_gtk.h"
-#elif defined(OS_WIN)
-#include "content/browser/renderer_host/render_widget_host_view_win.h"
-#endif
-
ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser)
: host_(host),
browser_(browser),
@@ -84,33 +76,8 @@ void ExtensionView::SetVisible(bool is_visible) {
void ExtensionView::CreateWidgetHostView() {
DCHECK(!initialized_);
initialized_ = true;
- RenderWidgetHostView* view =
- content::GetContentClient()->browser()->CreateViewForWidget(
- render_view_host());
-
- // TODO(mpcomplete): RWHV needs a cross-platform Init function.
-#if defined(USE_AURA)
- static_cast<RenderWidgetHostViewAura*>(view)->InitAsChild();
-#elif defined(TOUCH_UI)
- static_cast<RenderWidgetHostViewViews*>(view)->InitAsChild();
-#elif defined(TOOLKIT_USES_GTK)
- static_cast<RenderWidgetHostViewGtk*>(view)->InitAsChild();
-#elif defined(OS_WIN)
- // Create the HWND. Note:
- // RenderWidgetHostHWND supports windowed plugins, but if we ever also
- // wanted to support constrained windows with this, we would need an
- // additional HWND to parent off of because windowed plugin HWNDs cannot
- // exist in the same z-order as constrained windows.
- RenderWidgetHostViewWin* view_win =
- static_cast<RenderWidgetHostViewWin*>(view);
- view_win->Create(GetWidget()->GetNativeView());
- view_win->ShowWindow(SW_SHOW);
-#else
- NOTIMPLEMENTED();
-#endif
-
- Attach(view->GetNativeView());
- host_->CreateRenderViewSoon(view);
+ Attach(host_->host_contents()->view()->GetNativeView());
+ host_->CreateRenderViewSoon();
SetVisible(false);
}
@@ -186,16 +153,6 @@ void ExtensionView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
render_view_host()->view()->SetSize(size());
}
-void ExtensionView::HandleMouseMove() {
- if (container_)
- container_->OnExtensionMouseMove(this);
-}
-
-void ExtensionView::HandleMouseLeave() {
- if (container_)
- container_->OnExtensionMouseLeave(this);
-}
-
void ExtensionView::RenderViewCreated() {
if (!pending_background_.empty() && render_view_host()->view()) {
render_view_host()->view()->SetBackground(pending_background_);

Powered by Google App Engine
This is Rietveld 408576698