diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-11 19:36:56 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-11 19:36:56 +0000 |
| commit | 99519dc7184abc349683c092a292923604ba9f5b (patch) | |
| tree | 4c103ff4ee68bd0d4e1d39d3b88c6d7e582a949c /webkit/tools/test_shell/test_shell.h | |
| parent | 0b2765e449455ccd543d829df055a61fb3001108 (diff) | |
| download | chromium_src-99519dc7184abc349683c092a292923604ba9f5b.zip chromium_src-99519dc7184abc349683c092a292923604ba9f5b.tar.gz chromium_src-99519dc7184abc349683c092a292923604ba9f5b.tar.bz2 | |
Remove WebView::SetDelegate because I'd like to avoid having a method like this
in the WebKit API.
The only consumer was TestShell. It was using this method to replace its
TestWebViewDelegate instance. Instead, with this change, it has a manual Reset
method. To avoid duplication with the constructor, Reset uses operator=().
This required a couple changes:
1- Remove DISALLOW_COPY_AND_ASSIGN from WebViewDelegate. Anyways, that didn't
make sense since you cannot 'copy' a class with pure virtual methods.
2- Change scoped_ptr members of TestWebViewDelegate to linked_ptr. The extra
overhead of the linked_ptr seems warranted in this case.
I also changed TestWebViewDelegate to not be reference counted since it wasn't
necessary.
R=tony
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/164308
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.h')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h index 1c18e4f..4b6ed14 100644 --- a/webkit/tools/test_shell/test_shell.h +++ b/webkit/tools/test_shell/test_shell.h @@ -324,8 +324,8 @@ private: scoped_ptr<TestNavigationController> navigation_controller_; - scoped_refptr<TestWebViewDelegate> delegate_; - scoped_refptr<TestWebViewDelegate> popup_delegate_; + scoped_ptr<TestWebViewDelegate> delegate_; + scoped_ptr<TestWebViewDelegate> popup_delegate_; const TestParams* test_params_; |