| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_process_bindings.h" | 5 #include "chrome/renderer/extensions/extension_process_bindings.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "chrome/renderer/extensions/user_script_slave.h" | 35 #include "chrome/renderer/extensions/user_script_slave.h" |
| 36 #include "content/renderer/render_view.h" | 36 #include "content/renderer/render_view.h" |
| 37 #include "content/renderer/render_view_visitor.h" | 37 #include "content/renderer/render_view_visitor.h" |
| 38 #include "grit/common_resources.h" | 38 #include "grit/common_resources.h" |
| 39 #include "grit/renderer_resources.h" | 39 #include "grit/renderer_resources.h" |
| 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" | 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" |
| 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
| 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| 43 #include "third_party/skia/include/core/SkBitmap.h" | 43 #include "third_party/skia/include/core/SkBitmap.h" |
| 44 #include "third_party/skia/include/core/SkColor.h" | 44 #include "third_party/skia/include/core/SkColor.h" |
| 45 #include "v8/include/v8.h" |
| 45 #include "webkit/glue/webkit_glue.h" | 46 #include "webkit/glue/webkit_glue.h" |
| 46 | 47 |
| 47 using WebKit::WebFrame; | 48 using WebKit::WebFrame; |
| 48 using WebKit::WebView; | 49 using WebKit::WebView; |
| 49 | 50 |
| 50 namespace { | 51 namespace { |
| 51 | 52 |
| 52 const char kExtensionName[] = "chrome/ExtensionProcessBindings"; | 53 const char kExtensionName[] = "chrome/ExtensionProcessBindings"; |
| 53 const char* kExtensionDeps[] = { | 54 const char* kExtensionDeps[] = { |
| 54 EventBindings::kName, | 55 EventBindings::kName, |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 600 if (!retval.IsEmpty() && !retval->IsUndefined()) { | 601 if (!retval.IsEmpty() && !retval->IsUndefined()) { |
| 601 std::string error = *v8::String::AsciiValue(retval); | 602 std::string error = *v8::String::AsciiValue(retval); |
| 602 DCHECK(false) << error; | 603 DCHECK(false) << error; |
| 603 } | 604 } |
| 604 #endif | 605 #endif |
| 605 | 606 |
| 606 request->second->context.Dispose(); | 607 request->second->context.Dispose(); |
| 607 request->second->context.Clear(); | 608 request->second->context.Clear(); |
| 608 g_pending_requests.Get().erase(request); | 609 g_pending_requests.Get().erase(request); |
| 609 } | 610 } |
| OLD | NEW |