| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" |
| 7 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| 8 #include "ui/base/win/hwnd_util.h" | 9 #include "ui/base/win/hwnd_util.h" |
| 9 #include "ui/gfx/rect.h" | 10 #include "ui/gfx/rect.h" |
| 10 #include "ui/gfx/size.h" | 11 #include "ui/gfx/size.h" |
| 11 #include "webkit/glue/webpreferences.h" | 12 #include "webkit/glue/webpreferences.h" |
| 12 #include "webkit/tools/test_shell/test_webview_delegate.h" | 13 #include "webkit/tools/test_shell/test_webview_delegate.h" |
| 13 | 14 |
| 14 using namespace WebKit; | 15 using namespace WebKit; |
| 15 | 16 |
| 16 static const wchar_t kWindowClassName[] = L"WebViewHost"; | 17 static const wchar_t kWindowClassName[] = L"WebViewHost"; |
| (...skipping 20 matching lines...) Expand all Loading... |
| 37 | 38 |
| 38 host->view_ = CreateWindow(kWindowClassName, NULL, | 39 host->view_ = CreateWindow(kWindowClassName, NULL, |
| 39 WS_CHILD|WS_CLIPCHILDREN|WS_CLIPSIBLINGS, 0, 0, | 40 WS_CHILD|WS_CLIPCHILDREN|WS_CLIPSIBLINGS, 0, 0, |
| 40 0, 0, parent_view, NULL, | 41 0, 0, parent_view, NULL, |
| 41 GetModuleHandle(NULL), NULL); | 42 GetModuleHandle(NULL), NULL); |
| 42 ui::SetWindowUserData(host->view_, host); | 43 ui::SetWindowUserData(host->view_, host); |
| 43 | 44 |
| 44 host->webwidget_ = WebView::create(delegate); | 45 host->webwidget_ = WebView::create(delegate); |
| 45 host->webview()->setDevToolsAgentClient(dev_tools_client); | 46 host->webview()->setDevToolsAgentClient(dev_tools_client); |
| 46 prefs.Apply(host->webview()); | 47 prefs.Apply(host->webview()); |
| 48 host->webview()->settings()->setExperimentalCSSGridLayoutEnabled(true); |
| 47 host->webview()->initializeMainFrame(delegate); | 49 host->webview()->initializeMainFrame(delegate); |
| 48 | 50 |
| 49 return host; | 51 return host; |
| 50 } | 52 } |
| 51 | 53 |
| 52 WebView* WebViewHost::webview() const { | 54 WebView* WebViewHost::webview() const { |
| 53 return static_cast<WebView*>(webwidget_); | 55 return static_cast<WebView*>(webwidget_); |
| 54 } | 56 } |
| OLD | NEW |