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

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

Issue 1223033002: Remove dom_utils. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed the under-patch. Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « content/renderer/dom_utils.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "content/public/renderer/navigation_state.h" 59 #include "content/public/renderer/navigation_state.h"
60 #include "content/public/renderer/render_frame_observer.h" 60 #include "content/public/renderer/render_frame_observer.h"
61 #include "content/public/renderer/renderer_ppapi_host.h" 61 #include "content/public/renderer/renderer_ppapi_host.h"
62 #include "content/renderer/accessibility/renderer_accessibility.h" 62 #include "content/renderer/accessibility/renderer_accessibility.h"
63 #include "content/renderer/browser_plugin/browser_plugin.h" 63 #include "content/renderer/browser_plugin/browser_plugin.h"
64 #include "content/renderer/browser_plugin/browser_plugin_manager.h" 64 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
65 #include "content/renderer/child_frame_compositing_helper.h" 65 #include "content/renderer/child_frame_compositing_helper.h"
66 #include "content/renderer/context_menu_params_builder.h" 66 #include "content/renderer/context_menu_params_builder.h"
67 #include "content/renderer/devtools/devtools_agent.h" 67 #include "content/renderer/devtools/devtools_agent.h"
68 #include "content/renderer/dom_automation_controller.h" 68 #include "content/renderer/dom_automation_controller.h"
69 #include "content/renderer/dom_utils.h"
70 #include "content/renderer/external_popup_menu.h" 69 #include "content/renderer/external_popup_menu.h"
71 #include "content/renderer/geolocation_dispatcher.h" 70 #include "content/renderer/geolocation_dispatcher.h"
72 #include "content/renderer/gpu/gpu_benchmarking_extension.h" 71 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
73 #include "content/renderer/history_controller.h" 72 #include "content/renderer/history_controller.h"
74 #include "content/renderer/history_serialization.h" 73 #include "content/renderer/history_serialization.h"
75 #include "content/renderer/image_downloader/image_downloader_impl.h" 74 #include "content/renderer/image_downloader/image_downloader_impl.h"
76 #include "content/renderer/ime_event_guard.h" 75 #include "content/renderer/ime_event_guard.h"
77 #include "content/renderer/internal_document_state_data.h" 76 #include "content/renderer/internal_document_state_data.h"
78 #include "content/renderer/manifest/manifest_manager.h" 77 #include "content/renderer/manifest/manifest_manager.h"
79 #include "content/renderer/media/audio_renderer_mixer_manager.h" 78 #include "content/renderer/media/audio_renderer_mixer_manager.h"
(...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1232 const CustomContextMenuContext& custom_context) { 1231 const CustomContextMenuContext& custom_context) {
1233 if (custom_context.request_id) { 1232 if (custom_context.request_id) {
1234 // External request, should be in our map. 1233 // External request, should be in our map.
1235 ContextMenuClient* client = 1234 ContextMenuClient* client =
1236 pending_context_menus_.Lookup(custom_context.request_id); 1235 pending_context_menus_.Lookup(custom_context.request_id);
1237 if (client) { 1236 if (client) {
1238 client->OnMenuClosed(custom_context.request_id); 1237 client->OnMenuClosed(custom_context.request_id);
1239 pending_context_menus_.Remove(custom_context.request_id); 1238 pending_context_menus_.Remove(custom_context.request_id);
1240 } 1239 }
1241 } else { 1240 } else {
1242 if (custom_context.link_followed.is_valid()) { 1241 if (custom_context.link_followed.is_valid())
1243 frame_->sendPings( 1242 frame_->sendPings(context_menu_node_, custom_context.link_followed);
1244 DomUtils::ExtractParentAnchorNode(context_menu_node_),
1245 custom_context.link_followed);
1246 }
1247 // Internal request, forward to WebKit. 1243 // Internal request, forward to WebKit.
1248 context_menu_node_.reset(); 1244 context_menu_node_.reset();
1249 } 1245 }
1250 } 1246 }
1251 1247
1252 void RenderFrameImpl::OnCustomContextMenuAction( 1248 void RenderFrameImpl::OnCustomContextMenuAction(
1253 const CustomContextMenuContext& custom_context, 1249 const CustomContextMenuContext& custom_context,
1254 unsigned action) { 1250 unsigned action) {
1255 if (custom_context.request_id) { 1251 if (custom_context.request_id) {
1256 // External context menu request, look in our map. 1252 // External context menu request, look in our map.
(...skipping 3748 matching lines...) Expand 10 before | Expand all | Expand 10 after
5005 void RenderFrameImpl::RegisterMojoServices() { 5001 void RenderFrameImpl::RegisterMojoServices() {
5006 // Only main frame have ImageDownloader service. 5002 // Only main frame have ImageDownloader service.
5007 if (!frame_->parent()) { 5003 if (!frame_->parent()) {
5008 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( 5004 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
5009 base::Bind(&ImageDownloaderImpl::CreateMojoService, 5005 base::Bind(&ImageDownloaderImpl::CreateMojoService,
5010 base::Unretained(this))); 5006 base::Unretained(this)));
5011 } 5007 }
5012 } 5008 }
5013 5009
5014 } // namespace content 5010 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/dom_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698