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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1471993002: Resume cursor blinking on closing context menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: robusted onContextMenuClosed() and fixed nits Created 5 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1397 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 if (client) { 1408 if (client) {
1409 client->OnMenuClosed(custom_context.request_id); 1409 client->OnMenuClosed(custom_context.request_id);
1410 pending_context_menus_.Remove(custom_context.request_id); 1410 pending_context_menus_.Remove(custom_context.request_id);
1411 } 1411 }
1412 } else { 1412 } else {
1413 if (custom_context.link_followed.is_valid()) 1413 if (custom_context.link_followed.is_valid())
1414 frame_->sendPings(context_menu_node_, custom_context.link_followed); 1414 frame_->sendPings(context_menu_node_, custom_context.link_followed);
1415 // Internal request, forward to WebKit. 1415 // Internal request, forward to WebKit.
1416 context_menu_node_.reset(); 1416 context_menu_node_.reset();
1417 } 1417 }
1418
1419 render_view()->webview()->didCloseContextMenu();
1418 } 1420 }
1419 1421
1420 void RenderFrameImpl::OnCustomContextMenuAction( 1422 void RenderFrameImpl::OnCustomContextMenuAction(
1421 const CustomContextMenuContext& custom_context, 1423 const CustomContextMenuContext& custom_context,
1422 unsigned action) { 1424 unsigned action) {
1423 if (custom_context.request_id) { 1425 if (custom_context.request_id) {
1424 // External context menu request, look in our map. 1426 // External context menu request, look in our map.
1425 ContextMenuClient* client = 1427 ContextMenuClient* client =
1426 pending_context_menus_.Lookup(custom_context.request_id); 1428 pending_context_menus_.Lookup(custom_context.request_id);
1427 if (client) 1429 if (client)
(...skipping 3986 matching lines...) Expand 10 before | Expand all | Expand 10 after
5414 media::ConvertToSwitchOutputDeviceCB(web_callbacks); 5416 media::ConvertToSwitchOutputDeviceCB(web_callbacks);
5415 scoped_refptr<media::AudioOutputDevice> device = 5417 scoped_refptr<media::AudioOutputDevice> device =
5416 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), 5418 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(),
5417 security_origin); 5419 security_origin);
5418 media::OutputDeviceStatus status = device->GetDeviceStatus(); 5420 media::OutputDeviceStatus status = device->GetDeviceStatus();
5419 device->Stop(); 5421 device->Stop();
5420 callback.Run(status); 5422 callback.Run(status);
5421 } 5423 }
5422 5424
5423 } // namespace content 5425 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/android/content_view_core.h ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698