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

Unified Diff: content/browser/renderer_host/text_input_client_mac.mm

Issue 1318483007: Implement "Look Up In Dictionary" context menu item asynchronously. (OS X) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed review comments. Created 5 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
Index: content/browser/renderer_host/text_input_client_mac.mm
diff --git a/content/browser/renderer_host/text_input_client_mac.mm b/content/browser/renderer_host/text_input_client_mac.mm
index dac24b364f2cbba9be67881751044d8fe436eb4d..58bf35fa8412c048e1969c8797c9723e85e2844e 100644
--- a/content/browser/renderer_host/text_input_client_mac.mm
+++ b/content/browser/renderer_host/text_input_client_mac.mm
@@ -36,18 +36,38 @@ TextInputClientMac* TextInputClientMac::GetInstance() {
void TextInputClientMac::GetStringAtPoint(
RenderWidgetHost* rwh,
gfx::Point point,
- void (^replyHandler)(NSAttributedString*, NSPoint)) {
- DCHECK(replyHandler_.get() == nil);
- replyHandler_.reset(replyHandler, base::scoped_policy::RETAIN);
+ void (^reply_handler)(NSAttributedString*, NSPoint)) {
+ DCHECK(replyForPointHandler_.get() == nil);
+ replyForPointHandler_.reset(reply_handler, base::scoped_policy::RETAIN);
RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rwh);
rwhi->Send(new TextInputClientMsg_StringAtPoint(rwhi->GetRoutingID(), point));
}
void TextInputClientMac::GetStringAtPointReply(NSAttributedString* string,
NSPoint point) {
- if (replyHandler_.get()) {
- replyHandler_.get()(string, point);
- replyHandler_.reset();
+ if (replyForPointHandler_.get()) {
+ replyForPointHandler_.get()(string, point);
+ replyForPointHandler_.reset();
+ }
+}
+
+void TextInputClientMac::GetStringFromRange(
+ RenderWidgetHost* rwh,
+ NSRange range,
+ void (^reply_handler)(NSAttributedString*, NSPoint)) {
+ DCHECK(replyForRangeHandler_.get() == nil);
+ replyForRangeHandler_.reset(reply_handler, base::scoped_policy::RETAIN);
+ RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rwh);
+ rwhi->Send(new TextInputClientMsg_StringForRange(rwhi->GetRoutingID(),
+ gfx::Range(range)));
+}
+
+void TextInputClientMac::GetStringFromRangeReply(NSAttributedString* string,
+ NSPoint point) {
+ SetSubstringAndSignal(string);
+ if (replyForRangeHandler_.get()) {
+ replyForRangeHandler_.get()(string, point);
+ replyForRangeHandler_.reset();
}
}

Powered by Google App Engine
This is Rietveld 408576698