diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 23:34:47 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 23:34:47 +0000 |
| commit | 99e245069175bb380785b1594316d7d855e91795 (patch) | |
| tree | 971720e7e59bd762cb1910c5d43038029fcd537f | |
| parent | 73e5f815c42a56fb5010863d63d1df3e1d1f097a (diff) | |
| download | chromium_src-99e245069175bb380785b1594316d7d855e91795.zip chromium_src-99e245069175bb380785b1594316d7d855e91795.tar.gz chromium_src-99e245069175bb380785b1594316d7d855e91795.tar.bz2 | |
Fix touch build.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/6969076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85350 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_view_views.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/constrained_window_gtk.cc | 2 | ||||
| -rw-r--r-- | views/widget/widget.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc index 30e3eac..6a35d1b 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_views.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc @@ -438,7 +438,7 @@ gfx::NativeView RenderWidgetHostViewViews::GetInnerNativeView() const { // TODO(sad): Ideally this function should be equivalent to GetNativeView, and // WidgetGtk-specific function call should not be necessary. const views::WidgetGtk* widget = - static_cast<const views::WidgetGtk*>(GetWidget()); + static_cast<const views::WidgetGtk*>(GetWidget()->native_widget()); return widget ? widget->window_contents() : NULL; } diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc index 2078151..0584b89 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.cc +++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc @@ -123,7 +123,7 @@ void ConstrainedWindowGtk::FocusConstrainedWindow() { ConstrainedWindowGtk::TabContentsViewType* ConstrainedWindowGtk::ContainingView() { -#if defined(TOOLKIT_VIEWS) +#if defined(TOOLKIT_VIEWS) && !defined(TOUCH_UI) return static_cast<NativeTabContentsViewGtk*>( static_cast<TabContentsViewViews*>(owner_->view())-> native_tab_contents_view()); diff --git a/views/widget/widget.h b/views/widget/widget.h index 3c74618..13d7b5b 100644 --- a/views/widget/widget.h +++ b/views/widget/widget.h @@ -304,6 +304,7 @@ class Widget : public internal::NativeWidgetDelegate, ui::AccessibilityTypes::Event event_type, bool send_native_event); + const NativeWidget* native_widget() const { return native_widget_; } NativeWidget* native_widget() { return native_widget_; } // Overridden from NativeWidgetDelegate: |