summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/webview_host.h
diff options
context:
space:
mode:
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 23:31:25 +0000
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 23:31:25 +0000
commit6717bf27e115a3745e0418688436139c58dac753 (patch)
tree523fa301eeff4c292a140b56486e027bd075b0ed /webkit/tools/test_shell/webview_host.h
parentd1c1aa2d06acaf9bf3f55734a72bb28835367370 (diff)
downloadchromium_src-6717bf27e115a3745e0418688436139c58dac753.zip
chromium_src-6717bf27e115a3745e0418688436139c58dac753.tar.gz
chromium_src-6717bf27e115a3745e0418688436139c58dac753.tar.bz2
Quote WebPreferences in namespace webkit_glue.
To avoid name conflict when linking DumpRenderTree which has its own implementation of the class with the same name. BUG=127811 TEST=Build all without errors TBR=kalman@chromium.org,dpapad@chromium.org,ben@chromium.org,battre@chromium.org Review URL: https://chromiumcodereview.appspot.com/10384128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/webview_host.h')
-rw-r--r--webkit/tools/test_shell/webview_host.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/webview_host.h b/webkit/tools/test_shell/webview_host.h
index 5faf32d..9a99f03 100644
--- a/webkit/tools/test_shell/webview_host.h
+++ b/webkit/tools/test_shell/webview_host.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -14,7 +14,10 @@
#include "webkit/plugins/npapi/gtk_plugin_container_manager.h"
#endif
+namespace webkit_glue {
struct WebPreferences;
+}
+
class TestWebViewDelegate;
namespace WebKit {
@@ -31,7 +34,7 @@ class WebViewHost : public WebWidgetHost {
static WebViewHost* Create(gfx::NativeView parent_view,
TestWebViewDelegate* delegate,
WebKit::WebDevToolsAgentClient* devtools_client,
- const WebPreferences& prefs);
+ const webkit_glue::WebPreferences& prefs);
WebKit::WebView* webview() const;