OLD | NEW |
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 "chrome/renderer/extensions/extension_helper.h" | 5 #include "chrome/renderer/extensions/extension_helper.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/json/json_value_serializer.h" | 10 #include "base/json/json_value_serializer.h" |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 | 138 |
139 void ExtensionHelper::DidFinishLoad(WebKit::WebFrame* frame) { | 139 void ExtensionHelper::DidFinishLoad(WebKit::WebFrame* frame) { |
140 SchedulerMap::iterator i = g_schedulers.Get().find(frame); | 140 SchedulerMap::iterator i = g_schedulers.Get().find(frame); |
141 if (i != g_schedulers.Get().end()) | 141 if (i != g_schedulers.Get().end()) |
142 i->second->DidFinishLoad(); | 142 i->second->DidFinishLoad(); |
143 } | 143 } |
144 | 144 |
145 void ExtensionHelper::DidCreateDocumentElement(WebFrame* frame) { | 145 void ExtensionHelper::DidCreateDocumentElement(WebFrame* frame) { |
146 extension_dispatcher_->user_script_slave()->InjectScripts( | 146 extension_dispatcher_->user_script_slave()->InjectScripts( |
147 frame, UserScript::DOCUMENT_START); | 147 frame, UserScript::DOCUMENT_START); |
| 148 SchedulerMap::iterator i = g_schedulers.Get().find(frame); |
| 149 if (i != g_schedulers.Get().end()) |
| 150 i->second->DidCreateDocumentElement(); |
148 } | 151 } |
149 | 152 |
150 void ExtensionHelper::DidStartProvisionalLoad(WebKit::WebFrame* frame) { | 153 void ExtensionHelper::DidStartProvisionalLoad(WebKit::WebFrame* frame) { |
151 SchedulerMap::iterator i = g_schedulers.Get().find(frame); | 154 SchedulerMap::iterator i = g_schedulers.Get().find(frame); |
152 if (i != g_schedulers.Get().end()) | 155 if (i != g_schedulers.Get().end()) |
153 i->second->DidStartProvisionalLoad(); | 156 i->second->DidStartProvisionalLoad(); |
154 } | 157 } |
155 | 158 |
156 void ExtensionHelper::FrameDetached(WebFrame* frame) { | 159 void ExtensionHelper::FrameDetached(WebFrame* frame) { |
157 // This could be called before DidCreateDataSource, in which case the frame | 160 // This could be called before DidCreateDataSource, in which case the frame |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 routing_id(), *pending_app_info_)); | 353 routing_id(), *pending_app_info_)); |
351 pending_app_info_.reset(NULL); | 354 pending_app_info_.reset(NULL); |
352 } | 355 } |
353 | 356 |
354 void ExtensionHelper::AddErrorToRootConsole(const string16& message) { | 357 void ExtensionHelper::AddErrorToRootConsole(const string16& message) { |
355 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { | 358 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { |
356 render_view()->GetWebView()->mainFrame()->addMessageToConsole( | 359 render_view()->GetWebView()->mainFrame()->addMessageToConsole( |
357 WebConsoleMessage(WebConsoleMessage::LevelError, message)); | 360 WebConsoleMessage(WebConsoleMessage::LevelError, message)); |
358 } | 361 } |
359 } | 362 } |
OLD | NEW |