diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 22:13:03 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 22:13:03 +0000 |
| commit | 04fc948392b6fba1e640bd97eeea2293d9ed9b7e (patch) | |
| tree | 3c413c4bf8d139cdf932fdfc4b8a7e3cc812313f /webkit/glue/webview_impl.cc | |
| parent | e0d0014eb45448bf6bc59d905707d242f7517ba6 (diff) | |
| download | chromium_src-04fc948392b6fba1e640bd97eeea2293d9ed9b7e.zip chromium_src-04fc948392b6fba1e640bd97eeea2293d9ed9b7e.tar.gz chromium_src-04fc948392b6fba1e640bd97eeea2293d9ed9b7e.tar.bz2 | |
Fold WebEditingClient into WebViewClient.
R=dglazkov
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/211032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webview_impl.cc')
| -rw-r--r-- | webkit/glue/webview_impl.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 5bb7b72..278b115 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -99,7 +99,6 @@ using WebKit::WebDragOperation; using WebKit::WebDragOperationCopy; using WebKit::WebDragOperationNone; using WebKit::WebDragOperationsMask; -using WebKit::WebEditingClient; using WebKit::WebFrame; using WebKit::WebFrameClient; using WebKit::WebInputEvent; @@ -333,9 +332,8 @@ static const WebCore::PopupContainerSettings kAutocompletePopupSettings = { // WebView ---------------------------------------------------------------- /*static*/ -WebView* WebView::Create(WebViewDelegate* delegate, - WebEditingClient* editing_client) { - WebViewImpl* instance = new WebViewImpl(delegate, editing_client); +WebView* WebView::Create(WebViewDelegate* delegate) { + WebViewImpl* instance = new WebViewImpl(delegate); instance->AddRef(); return instance; } @@ -373,14 +371,13 @@ void WebView::ResetVisitedLinkState() { } -WebViewImpl::WebViewImpl(WebViewDelegate* delegate, - WebEditingClient* editing_client) +WebViewImpl::WebViewImpl(WebViewDelegate* delegate) : delegate_(delegate), ALLOW_THIS_IN_INITIALIZER_LIST(back_forward_list_client_impl_(this)), ALLOW_THIS_IN_INITIALIZER_LIST(chrome_client_impl_(this)), ALLOW_THIS_IN_INITIALIZER_LIST(context_menu_client_impl_(this)), ALLOW_THIS_IN_INITIALIZER_LIST(drag_client_impl_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(editor_client_impl_(this, editing_client)), + ALLOW_THIS_IN_INITIALIZER_LIST(editor_client_impl_(this)), ALLOW_THIS_IN_INITIALIZER_LIST(inspector_client_impl_(this)), observed_new_navigation_(false), #ifndef NDEBUG |