Commit 91ad147d authored by ivankr@chromium.org's avatar ivankr@chromium.org

Aura: fix crash when clicking on a SELECT element.

This fix doesn't display selection popups properly, though (because RenderWidgetHostViewAura::InitAsPopup is not implemented).

BUG=101899,99757
TEST=Manual: click on any SELECT element

Review URL: http://codereview.chromium.org/8363047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107571 0039d316-1c4b-4281-b951-d872f2087c98
parent cb673f6b
...@@ -113,7 +113,9 @@ ...@@ -113,7 +113,9 @@
#include "chrome/browser/ui/crypto_module_password_dialog.h" #include "chrome/browser/ui/crypto_module_password_dialog.h"
#endif #endif
#if defined(USE_AURA) || defined(TOUCH_UI) #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" #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
#elif defined(OS_WIN) #elif defined(OS_WIN)
#include "chrome/browser/renderer_host/render_widget_host_view_views.h" #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
...@@ -229,7 +231,9 @@ void ChromeContentBrowserClient::CreateBrowserMainParts( ...@@ -229,7 +231,9 @@ void ChromeContentBrowserClient::CreateBrowserMainParts(
RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget( RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget(
RenderWidgetHost* widget) { RenderWidgetHost* widget) {
#if defined(USE_AURA) || defined(TOUCH_UI) #if defined(USE_AURA)
return new RenderWidgetHostViewAura(widget);
#elif defined(TOUCH_UI)
return new RenderWidgetHostViewViews(widget); return new RenderWidgetHostViewViews(widget);
#elif defined(OS_WIN) #elif defined(OS_WIN)
if (views::Widget::IsPureViews()) if (views::Widget::IsPureViews())
......
...@@ -95,11 +95,17 @@ void RenderWidgetHostViewAura::InitAsPopup( ...@@ -95,11 +95,17 @@ void RenderWidgetHostViewAura::InitAsPopup(
RenderWidgetHostView* parent_host_view, RenderWidgetHostView* parent_host_view,
const gfx::Rect& pos) { const gfx::Rect& pos) {
NOTIMPLEMENTED(); NOTIMPLEMENTED();
// TODO(ivankr): there has to be an Init() call, otherwise |window_|
// is left uninitialized and will eventually crash.
Init();
} }
void RenderWidgetHostViewAura::InitAsFullscreen( void RenderWidgetHostViewAura::InitAsFullscreen(
RenderWidgetHostView* reference_host_view) { RenderWidgetHostView* reference_host_view) {
NOTIMPLEMENTED(); NOTIMPLEMENTED();
// TODO(ivankr): there has to be an Init() call, otherwise |window_|
// is left uninitialized and will eventually crash.
Init();
} }
RenderWidgetHost* RenderWidgetHostViewAura::GetRenderWidgetHost() const { RenderWidgetHost* RenderWidgetHostViewAura::GetRenderWidgetHost() const {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment