diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 04:29:17 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 04:29:17 +0000 |
commit | 3d96893747d18a3c1bf06084d4605a4b34af732f (patch) | |
tree | 9347442c4dd581ab825ed22cddc082e6119000e4 /webkit/glue/cpp_bound_class_unittest.cc | |
parent | 47b0ee174aa53dd1fd473bafae35166538f57a68 (diff) | |
download | chromium_src-3d96893747d18a3c1bf06084d4605a4b34af732f.zip chromium_src-3d96893747d18a3c1bf06084d4605a4b34af732f.tar.gz chromium_src-3d96893747d18a3c1bf06084d4605a4b34af732f.tar.bz2 |
Hook up WebFrameClient, replacing many WebViewDelegate methods.
Moved NavigationGesture out of webview_delegate.h into its own
header in chrome/common since it is only needed by Chrome.
Adds WebFrame::isProcessingUserGesture to facilitate the removal
of NavigationGesture.
Cleaned up some TestShell methods related to URL loading. The
method to load an URL now takes a GURL instead of a wchar_t*.
R=dglazkov
BUG=21332
TEST=none
Review URL: http://codereview.chromium.org/200054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/cpp_bound_class_unittest.cc')
-rw-r--r-- | webkit/glue/cpp_bound_class_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/cpp_bound_class_unittest.cc b/webkit/glue/cpp_bound_class_unittest.cc index 7bfd8a5..bdddd11 100644 --- a/webkit/glue/cpp_bound_class_unittest.cc +++ b/webkit/glue/cpp_bound_class_unittest.cc @@ -70,8 +70,8 @@ class ExampleTestShell : public TestShell { // This is a public interface to TestShell's protected method, so it // can be called by our CreateEmptyWindow. - bool PublicInitialize(const std::wstring& startingURL) { - return Initialize(startingURL); + bool PublicInitialize(const std::string& starting_url) { + return Initialize(GURL(starting_url)); } CppBindingExampleWithOptionalFallback example_bound_class_; @@ -84,7 +84,7 @@ class CppBoundClassTest : public TestShellTest { virtual void CreateEmptyWindow() { ExampleTestShell* host = new ExampleTestShell(useFallback()); ASSERT_TRUE(host != NULL); - bool rv = host->PublicInitialize(L"about:blank"); + bool rv = host->PublicInitialize("about:blank"); if (rv) { test_shell_ = host; TestShell::windowList()->push_back(host->mainWnd()); |