| OLD | NEW |
| 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 "chrome/renderer/extensions/render_view_observer_natives.h" | 5 #include "chrome/renderer/extensions/render_view_observer_natives.h" |
| 6 | 6 |
| 7 #include "chrome/renderer/extensions/dispatcher.h" | 7 #include "chrome/renderer/extensions/dispatcher.h" |
| 8 #include "content/public/renderer/render_view.h" | 8 #include "content/public/renderer/render_view.h" |
| 9 #include "content/public/renderer/render_view_observer.h" | 9 #include "content/public/renderer/render_view_observer.h" |
| 10 #include "extensions/common/extension_api.h" | 10 #include "extensions/common/extension_api.h" |
| 11 #include "third_party/WebKit/public/web/WebFrame.h" | 11 #include "third_party/WebKit/public/web/WebFrame.h" |
| 12 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h" | 12 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h" |
| 13 | 13 |
| 14 namespace extensions { | 14 namespace extensions { |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 // Deletes itself when done. | 18 // Deletes itself when done. |
| 19 class LoadWatcher : public content::RenderViewObserver { | 19 class LoadWatcher : public content::RenderViewObserver { |
| 20 public: | 20 public: |
| 21 LoadWatcher(ChromeV8Context* context, | 21 LoadWatcher(ChromeV8Context* context, |
| 22 content::RenderView* view, | 22 content::RenderView* view, |
| 23 v8::Handle<v8::Function> cb) | 23 v8::Handle<v8::Function> cb) |
| 24 : content::RenderViewObserver(view), | 24 : content::RenderViewObserver(view), |
| 25 context_(context), | 25 context_(context), |
| 26 callback_(cb) { | 26 callback_(cb) { |
| 27 } | 27 } |
| 28 | 28 |
| 29 virtual void DidCreateDocumentElement(blink::WebFrame* frame) OVERRIDE { | 29 virtual void DidCreateDocumentElement(blink::WebLocalFrame* frame) OVERRIDE { |
| 30 CallbackAndDie(true); | 30 CallbackAndDie(true); |
| 31 } | 31 } |
| 32 | 32 |
| 33 virtual void DidFailProvisionalLoad( | 33 virtual void DidFailProvisionalLoad(blink::WebLocalFrame* frame, |
| 34 blink::WebFrame* frame, | 34 const blink::WebURLError& error) |
| 35 const blink::WebURLError& error) OVERRIDE { | 35 OVERRIDE { |
| 36 CallbackAndDie(false); | 36 CallbackAndDie(false); |
| 37 } | 37 } |
| 38 | 38 |
| 39 private: | 39 private: |
| 40 void CallbackAndDie(bool succeeded) { | 40 void CallbackAndDie(bool succeeded) { |
| 41 v8::Isolate* isolate = context_->isolate(); | 41 v8::Isolate* isolate = context_->isolate(); |
| 42 v8::HandleScope handle_scope(isolate); | 42 v8::HandleScope handle_scope(isolate); |
| 43 v8::Handle<v8::Value> args[] = { v8::Boolean::New(isolate, succeeded) }; | 43 v8::Handle<v8::Value> args[] = { v8::Boolean::New(isolate, succeeded) }; |
| 44 context_->CallFunction(callback_.NewHandle(isolate), 1, args); | 44 context_->CallFunction(callback_.NewHandle(isolate), 1, args); |
| 45 delete this; | 45 delete this; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 73 LOG(WARNING) << "No render view found to register LoadWatcher."; | 73 LOG(WARNING) << "No render view found to register LoadWatcher."; |
| 74 return; | 74 return; |
| 75 } | 75 } |
| 76 | 76 |
| 77 new LoadWatcher(context(), view, args[1].As<v8::Function>()); | 77 new LoadWatcher(context(), view, args[1].As<v8::Function>()); |
| 78 | 78 |
| 79 args.GetReturnValue().Set(true); | 79 args.GetReturnValue().Set(true); |
| 80 } | 80 } |
| 81 | 81 |
| 82 } // namespace extensions | 82 } // namespace extensions |
| OLD | NEW |