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

Unified Diff: webkit/glue/webview_impl.cc

Issue 196128: Hook up WebViewClient, part 1.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/webview_impl.h ('k') | webkit/tools/test_shell/layout_test_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webview_impl.cc
===================================================================
--- webkit/glue/webview_impl.cc (revision 26230)
+++ webkit/glue/webview_impl.cc (working copy)
@@ -116,6 +116,7 @@
using WebKit::WebTextDirectionDefault;
using WebKit::WebTextDirectionLeftToRight;
using WebKit::WebTextDirectionRightToLeft;
+using WebKit::WebURL;
using webkit_glue::ImageResourceFetcher;
@@ -457,7 +458,7 @@
if (!main_frame() || !main_frame()->frameview())
return;
- delegate_->UpdateTargetURL(this, GURL());
+ client()->setMouseOverURL(WebURL());
main_frame()->frame()->eventHandler()->handleMouseMoveEvent(
PlatformMouseEventBuilder(main_frame()->frameview(), event));
@@ -1814,14 +1815,14 @@
observed_new_navigation_ = false;
}
-void WebViewImpl::StartDragging(WebPoint event_pos,
+void WebViewImpl::StartDragging(const WebPoint& event_pos,
const WebDragData& drag_data,
WebDragOperationsMask mask) {
- if (delegate_) {
- DCHECK(!doing_drag_and_drop_);
- doing_drag_and_drop_ = true;
- delegate_->StartDragging(this, event_pos, drag_data, mask);
- }
+ if (!client())
+ return;
+ DCHECK(!doing_drag_and_drop_);
+ doing_drag_and_drop_ = true;
+ client()->startDragging(event_pos, drag_data, mask);
}
void WebViewImpl::OnImageFetchComplete(ImageResourceFetcher* fetcher,
« no previous file with comments | « webkit/glue/webview_impl.h ('k') | webkit/tools/test_shell/layout_test_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698