Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(638)

Side by Side Diff: webkit/tools/test_shell/webview_host_gtk.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <gtk/gtk.h> 5 #include <gtk/gtk.h>
6 6
7 #include "webkit/tools/test_shell/webview_host.h" 7 #include "webkit/tools/test_shell/webview_host.h"
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/gfx/rect.h" 10 #include "base/gfx/rect.h"
11 #include "base/gfx/size.h" 11 #include "base/gfx/size.h"
12 #include "skia/ext/platform_canvas.h" 12 #include "skia/ext/platform_canvas.h"
13 #include "webkit/api/public/WebView.h" 13 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
14 #include "webkit/glue/plugins/gtk_plugin_container.h" 14 #include "webkit/glue/plugins/gtk_plugin_container.h"
15 #include "webkit/glue/webpreferences.h" 15 #include "webkit/glue/webpreferences.h"
16 #include "webkit/tools/test_shell/test_webview_delegate.h" 16 #include "webkit/tools/test_shell/test_webview_delegate.h"
17 17
18 using WebKit::WebView; 18 using WebKit::WebView;
19 19
20 // static 20 // static
21 WebViewHost* WebViewHost::Create(GtkWidget* parent_view, 21 WebViewHost* WebViewHost::Create(GtkWidget* parent_view,
22 TestWebViewDelegate* delegate, 22 TestWebViewDelegate* delegate,
23 const WebPreferences& prefs) { 23 const WebPreferences& prefs) {
(...skipping 14 matching lines...) Expand all
38 return static_cast<WebView*>(webwidget_); 38 return static_cast<WebView*>(webwidget_);
39 } 39 }
40 40
41 void WebViewHost::CreatePluginContainer(gfx::PluginWindowHandle id) { 41 void WebViewHost::CreatePluginContainer(gfx::PluginWindowHandle id) {
42 plugin_container_manager_.CreatePluginContainer(id); 42 plugin_container_manager_.CreatePluginContainer(id);
43 } 43 }
44 44
45 void WebViewHost::DestroyPluginContainer(gfx::PluginWindowHandle id) { 45 void WebViewHost::DestroyPluginContainer(gfx::PluginWindowHandle id) {
46 plugin_container_manager_.DestroyPluginContainer(id); 46 plugin_container_manager_.DestroyPluginContainer(id);
47 } 47 }
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/text_input_controller.cc ('k') | webkit/tools/test_shell/webview_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698