| Index: webkit/tools/test_shell/test_webview_delegate.cc
|
| diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
|
| index 631d48e8a4302ec2ad8e20e73ddfb4c6d7a036e6..684b22ac3b294401e329b89cbf27044593a815b8 100644
|
| --- a/webkit/tools/test_shell/test_webview_delegate.cc
|
| +++ b/webkit/tools/test_shell/test_webview_delegate.cc
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "base/file_util.h"
|
| #include "base/gfx/point.h"
|
| +#include "base/gfx/native_widget_types.h"
|
| #include "base/message_loop.h"
|
| #include "base/string_util.h"
|
| #include "base/trace_event.h"
|
| @@ -664,9 +665,11 @@ void TestWebViewDelegate::SetUserStyleSheetLocation(const GURL& location) {
|
|
|
| // WebWidgetDelegate ---------------------------------------------------------
|
|
|
| -gfx::NativeView TestWebViewDelegate::GetContainingView(WebWidget* webwidget) {
|
| +gfx::NativeViewId TestWebViewDelegate::GetContainingView(WebWidget* webwidget) {
|
| + // For test shell, we pack a NativeView pointer into the NativeViewId since
|
| + // everything is single process.
|
| if (WebWidgetHost* host = GetHostForWidget(webwidget))
|
| - return host->view_handle();
|
| + return gfx::IdFromNativeView(host->view_handle());
|
|
|
| return NULL;
|
| }
|
|
|