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

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

Issue 157713002: Switch DomAutomationController to be a RenderFrameObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_frame_impl.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include "content/public/renderer/render_view_visitor.h" 70 #include "content/public/renderer/render_view_visitor.h"
71 #include "content/public/renderer/web_preferences.h" 71 #include "content/public/renderer/web_preferences.h"
72 #include "content/renderer/accessibility/renderer_accessibility.h" 72 #include "content/renderer/accessibility/renderer_accessibility.h"
73 #include "content/renderer/accessibility/renderer_accessibility_complete.h" 73 #include "content/renderer/accessibility/renderer_accessibility_complete.h"
74 #include "content/renderer/accessibility/renderer_accessibility_focus_only.h" 74 #include "content/renderer/accessibility/renderer_accessibility_focus_only.h"
75 #include "content/renderer/browser_plugin/browser_plugin.h" 75 #include "content/renderer/browser_plugin/browser_plugin.h"
76 #include "content/renderer/browser_plugin/browser_plugin_manager.h" 76 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
77 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h" 77 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
78 #include "content/renderer/devtools/devtools_agent.h" 78 #include "content/renderer/devtools/devtools_agent.h"
79 #include "content/renderer/disambiguation_popup_helper.h" 79 #include "content/renderer/disambiguation_popup_helper.h"
80 #include "content/renderer/dom_automation_controller.h"
81 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 80 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
82 #include "content/renderer/drop_data_builder.h" 81 #include "content/renderer/drop_data_builder.h"
83 #include "content/renderer/external_popup_menu.h" 82 #include "content/renderer/external_popup_menu.h"
84 #include "content/renderer/geolocation_dispatcher.h" 83 #include "content/renderer/geolocation_dispatcher.h"
85 #include "content/renderer/gpu/render_widget_compositor.h" 84 #include "content/renderer/gpu/render_widget_compositor.h"
86 #include "content/renderer/idle_user_detector.h" 85 #include "content/renderer/idle_user_detector.h"
87 #include "content/renderer/image_loading_helper.h" 86 #include "content/renderer/image_loading_helper.h"
88 #include "content/renderer/ime_event_guard.h" 87 #include "content/renderer/ime_event_guard.h"
89 #include "content/renderer/input/input_handler_manager.h" 88 #include "content/renderer/input/input_handler_manager.h"
90 #include "content/renderer/input_tag_speech_dispatcher.h" 89 #include "content/renderer/input_tag_speech_dispatcher.h"
(...skipping 2969 matching lines...) Expand 10 before | Expand all | Expand 10 after
3060 FOR_EACH_OBSERVER(RenderViewObserver, observers_, 3059 FOR_EACH_OBSERVER(RenderViewObserver, observers_,
3061 DidClearWindowObject(frame, world_id)); 3060 DidClearWindowObject(frame, world_id));
3062 3061
3063 // Only install controllers into the main world. 3062 // Only install controllers into the main world.
3064 if (world_id) 3063 if (world_id)
3065 return; 3064 return;
3066 3065
3067 if (enabled_bindings_& BINDINGS_POLICY_WEB_UI) 3066 if (enabled_bindings_& BINDINGS_POLICY_WEB_UI)
3068 WebUIExtension::Install(frame); 3067 WebUIExtension::Install(frame);
3069 3068
3070 if (enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION)
3071 DomAutomationController::Install(this, frame);
3072
3073 if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION) 3069 if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION)
3074 StatsCollectionController::Install(frame); 3070 StatsCollectionController::Install(frame);
3075 3071
3076 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 3072 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
3077 3073
3078 if (command_line.HasSwitch(switches::kEnableSkiaBenchmarking)) 3074 if (command_line.HasSwitch(switches::kEnableSkiaBenchmarking))
3079 SkiaBenchmarking::Install(frame); 3075 SkiaBenchmarking::Install(frame);
3080 3076
3081 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) 3077 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking))
3082 MemoryBenchmarkingExtension::Install(frame); 3078 MemoryBenchmarkingExtension::Install(frame);
(...skipping 2467 matching lines...) Expand 10 before | Expand all | Expand 10 after
5550 for (size_t i = 0; i < icon_urls.size(); i++) { 5546 for (size_t i = 0; i < icon_urls.size(); i++) {
5551 WebURL url = icon_urls[i].iconURL(); 5547 WebURL url = icon_urls[i].iconURL();
5552 if (!url.isEmpty()) 5548 if (!url.isEmpty())
5553 urls.push_back(FaviconURL(url, 5549 urls.push_back(FaviconURL(url,
5554 ToFaviconType(icon_urls[i].iconType()))); 5550 ToFaviconType(icon_urls[i].iconType())));
5555 } 5551 }
5556 SendUpdateFaviconURL(urls); 5552 SendUpdateFaviconURL(urls);
5557 } 5553 }
5558 5554
5559 } // namespace content 5555 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698