| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/tools/test_shell/webview_host.h" | 5 #include "webkit/tools/test_shell/webview_host.h" |
| 6 | 6 |
| 7 #include "base/gfx/rect.h" | 7 #include "base/gfx/rect.h" |
| 8 #include "base/gfx/size.h" | 8 #include "base/gfx/size.h" |
| 9 #include "base/win_util.h" | 9 #include "base/win_util.h" |
| 10 #include "skia/ext/platform_canvas.h" | 10 #include "skia/ext/platform_canvas.h" |
| 11 #include "webkit/api/public/WebView.h" | 11 #include "third_party/WebKit/WebKit/chromium/public/WebView.h" |
| 12 #include "webkit/glue/webpreferences.h" | 12 #include "webkit/glue/webpreferences.h" |
| 13 #include "webkit/tools/test_shell/test_webview_delegate.h" | 13 #include "webkit/tools/test_shell/test_webview_delegate.h" |
| 14 | 14 |
| 15 using namespace WebKit; | 15 using namespace WebKit; |
| 16 | 16 |
| 17 static const wchar_t kWindowClassName[] = L"WebViewHost"; | 17 static const wchar_t kWindowClassName[] = L"WebViewHost"; |
| 18 | 18 |
| 19 /*static*/ | 19 /*static*/ |
| 20 WebViewHost* WebViewHost::Create(HWND parent_view, | 20 WebViewHost* WebViewHost::Create(HWND parent_view, |
| 21 TestWebViewDelegate* delegate, | 21 TestWebViewDelegate* delegate, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 44 host->webwidget_ = WebView::create(delegate); | 44 host->webwidget_ = WebView::create(delegate); |
| 45 prefs.Apply(host->webview()); | 45 prefs.Apply(host->webview()); |
| 46 host->webview()->initializeMainFrame(delegate); | 46 host->webview()->initializeMainFrame(delegate); |
| 47 | 47 |
| 48 return host; | 48 return host; |
| 49 } | 49 } |
| 50 | 50 |
| 51 WebView* WebViewHost::webview() const { | 51 WebView* WebViewHost::webview() const { |
| 52 return static_cast<WebView*>(webwidget_); | 52 return static_cast<WebView*>(webwidget_); |
| 53 } | 53 } |
| OLD | NEW |