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

Side by Side Diff: webkit/tools/test_shell/webview_host.h

Issue 10384128: Quote WebPreferences in namespace webkit_glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copyright 2012 Created 8 years, 7 months 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 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 #ifndef WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_ 5 #ifndef WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_
6 #define WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_ 6 #define WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "ui/gfx/native_widget_types.h" 9 #include "ui/gfx/native_widget_types.h"
10 #include "ui/gfx/rect.h" 10 #include "ui/gfx/rect.h"
11 #include "webkit/tools/test_shell/webwidget_host.h" 11 #include "webkit/tools/test_shell/webwidget_host.h"
12 12
13 #if defined(TOOLKIT_GTK) 13 #if defined(TOOLKIT_GTK)
14 #include "webkit/plugins/npapi/gtk_plugin_container_manager.h" 14 #include "webkit/plugins/npapi/gtk_plugin_container_manager.h"
15 #endif 15 #endif
16 16
17 namespace webkit_glue {
17 struct WebPreferences; 18 struct WebPreferences;
19 }
20
18 class TestWebViewDelegate; 21 class TestWebViewDelegate;
19 22
20 namespace WebKit { 23 namespace WebKit {
21 class WebDevToolsAgentClient; 24 class WebDevToolsAgentClient;
22 class WebView; 25 class WebView;
23 } 26 }
24 27
25 // This class is a simple NativeView-based host for a WebView 28 // This class is a simple NativeView-based host for a WebView
26 class WebViewHost : public WebWidgetHost { 29 class WebViewHost : public WebWidgetHost {
27 public: 30 public:
28 // The new instance is deleted once the associated NativeView is destroyed. 31 // The new instance is deleted once the associated NativeView is destroyed.
29 // The newly created window should be resized after it is created, using the 32 // The newly created window should be resized after it is created, using the
30 // MoveWindow (or equivalent) function. 33 // MoveWindow (or equivalent) function.
31 static WebViewHost* Create(gfx::NativeView parent_view, 34 static WebViewHost* Create(gfx::NativeView parent_view,
32 TestWebViewDelegate* delegate, 35 TestWebViewDelegate* delegate,
33 WebKit::WebDevToolsAgentClient* devtools_client, 36 WebKit::WebDevToolsAgentClient* devtools_client,
34 const WebPreferences& prefs); 37 const webkit_glue::WebPreferences& prefs);
35 38
36 WebKit::WebView* webview() const; 39 WebKit::WebView* webview() const;
37 40
38 #if defined(TOOLKIT_GTK) 41 #if defined(TOOLKIT_GTK)
39 // Create a new plugin parent container for a given plugin XID. 42 // Create a new plugin parent container for a given plugin XID.
40 void CreatePluginContainer(gfx::PluginWindowHandle id); 43 void CreatePluginContainer(gfx::PluginWindowHandle id);
41 44
42 // Destroy the plugin parent container when a plugin has been destroyed. 45 // Destroy the plugin parent container when a plugin has been destroyed.
43 void DestroyPluginContainer(gfx::PluginWindowHandle id); 46 void DestroyPluginContainer(gfx::PluginWindowHandle id);
44 47
(...skipping 11 matching lines...) Expand all
56 } 59 }
57 #endif 60 #endif
58 61
59 #if defined(TOOLKIT_GTK) 62 #if defined(TOOLKIT_GTK)
60 // Helper class that creates and moves plugin containers. 63 // Helper class that creates and moves plugin containers.
61 webkit::npapi::GtkPluginContainerManager plugin_container_manager_; 64 webkit::npapi::GtkPluginContainerManager plugin_container_manager_;
62 #endif 65 #endif
63 }; 66 };
64 67
65 #endif // WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_ 68 #endif // WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_webview_delegate.cc ('k') | webkit/tools/test_shell/webview_host_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698