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_string_value_serializer.h" | 10 #include "base/json/json_string_value_serializer.h" |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 SchedulerMap::iterator i = g_schedulers.Get().find(frame); | 142 SchedulerMap::iterator i = g_schedulers.Get().find(frame); |
143 if (i != g_schedulers.Get().end()) | 143 if (i != g_schedulers.Get().end()) |
144 i->second->DidFinishLoad(); | 144 i->second->DidFinishLoad(); |
145 } | 145 } |
146 | 146 |
147 void ExtensionHelper::DidCreateDocumentElement(WebFrame* frame) { | 147 void ExtensionHelper::DidCreateDocumentElement(WebFrame* frame) { |
148 extension_dispatcher_->user_script_slave()->InjectScripts( | 148 extension_dispatcher_->user_script_slave()->InjectScripts( |
149 frame, UserScript::DOCUMENT_START); | 149 frame, UserScript::DOCUMENT_START); |
150 } | 150 } |
151 | 151 |
152 void ExtensionHelper::DidStartProvisionalLoad(WebKit::WebFrame* frame) { | 152 void ExtensionHelper::DidCommitProvisionalLoad(WebKit::WebFrame* frame, |
| 153 bool is_new_navigation) { |
153 SchedulerMap::iterator i = g_schedulers.Get().find(frame); | 154 SchedulerMap::iterator i = g_schedulers.Get().find(frame); |
154 if (i != g_schedulers.Get().end()) | 155 if (i != g_schedulers.Get().end()) |
155 i->second->DidStartProvisionalLoad(); | 156 i->second->DidCommitProvisionalLoad(); |
156 } | 157 } |
157 | 158 |
158 void ExtensionHelper::FrameDetached(WebFrame* frame) { | 159 void ExtensionHelper::FrameDetached(WebFrame* frame) { |
159 // This could be called before DidCreateDataSource, in which case the frame | 160 // This could be called before DidCreateDataSource, in which case the frame |
160 // won't be in the map. | 161 // won't be in the map. |
161 SchedulerMap::iterator i = g_schedulers.Get().find(frame); | 162 SchedulerMap::iterator i = g_schedulers.Get().find(frame); |
162 if (i == g_schedulers.Get().end()) | 163 if (i == g_schedulers.Get().end()) |
163 return; | 164 return; |
164 | 165 |
165 delete i->second; | 166 delete i->second; |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
356 routing_id(), *pending_app_info_)); | 357 routing_id(), *pending_app_info_)); |
357 pending_app_info_.reset(NULL); | 358 pending_app_info_.reset(NULL); |
358 } | 359 } |
359 | 360 |
360 void ExtensionHelper::AddErrorToRootConsole(const string16& message) { | 361 void ExtensionHelper::AddErrorToRootConsole(const string16& message) { |
361 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { | 362 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { |
362 render_view()->GetWebView()->mainFrame()->addMessageToConsole( | 363 render_view()->GetWebView()->mainFrame()->addMessageToConsole( |
363 WebConsoleMessage(WebConsoleMessage::LevelError, message)); | 364 WebConsoleMessage(WebConsoleMessage::LevelError, message)); |
364 } | 365 } |
365 } | 366 } |
OLD | NEW |