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_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 10 matching lines...) Expand all Loading... |
21 #include "chrome/renderer/extensions/chrome_webstore_bindings.h" | 21 #include "chrome/renderer/extensions/chrome_webstore_bindings.h" |
22 #include "chrome/renderer/extensions/event_bindings.h" | 22 #include "chrome/renderer/extensions/event_bindings.h" |
23 #include "chrome/renderer/extensions/extension_dispatcher.h" | 23 #include "chrome/renderer/extensions/extension_dispatcher.h" |
24 #include "chrome/renderer/extensions/miscellaneous_bindings.h" | 24 #include "chrome/renderer/extensions/miscellaneous_bindings.h" |
25 #include "chrome/renderer/extensions/schema_generated_bindings.h" | 25 #include "chrome/renderer/extensions/schema_generated_bindings.h" |
26 #include "chrome/renderer/extensions/user_script_idle_scheduler.h" | 26 #include "chrome/renderer/extensions/user_script_idle_scheduler.h" |
27 #include "chrome/renderer/extensions/user_script_slave.h" | 27 #include "chrome/renderer/extensions/user_script_slave.h" |
28 #include "content/public/renderer/render_view.h" | 28 #include "content/public/renderer/render_view.h" |
29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" | 29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" |
30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" | 31 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques
t.h" |
32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
33 #include "webkit/glue/image_resource_fetcher.h" | 33 #include "webkit/glue/image_resource_fetcher.h" |
34 #include "webkit/glue/resource_fetcher.h" | 34 #include "webkit/glue/resource_fetcher.h" |
35 | 35 |
36 using extensions::MiscellaneousBindings; | 36 using extensions::MiscellaneousBindings; |
37 using extensions::SchemaGeneratedBindings; | 37 using extensions::SchemaGeneratedBindings; |
38 using WebKit::WebConsoleMessage; | 38 using WebKit::WebConsoleMessage; |
39 using WebKit::WebDataSource; | 39 using WebKit::WebDataSource; |
40 using WebKit::WebFrame; | 40 using WebKit::WebFrame; |
41 using WebKit::WebURLRequest; | 41 using WebKit::WebURLRequest; |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 routing_id(), *pending_app_info_)); | 370 routing_id(), *pending_app_info_)); |
371 pending_app_info_.reset(NULL); | 371 pending_app_info_.reset(NULL); |
372 } | 372 } |
373 | 373 |
374 void ExtensionHelper::AddErrorToRootConsole(const string16& message) { | 374 void ExtensionHelper::AddErrorToRootConsole(const string16& message) { |
375 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { | 375 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { |
376 render_view()->GetWebView()->mainFrame()->addMessageToConsole( | 376 render_view()->GetWebView()->mainFrame()->addMessageToConsole( |
377 WebConsoleMessage(WebConsoleMessage::LevelError, message)); | 377 WebConsoleMessage(WebConsoleMessage::LevelError, message)); |
378 } | 378 } |
379 } | 379 } |
OLD | NEW |