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" |
11 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
14 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
15 #include "chrome/common/chrome_view_type.h" | 15 #include "chrome/common/chrome_view_type.h" |
16 #include "chrome/common/extensions/extension_messages.h" | 16 #include "chrome/common/extensions/extension_messages.h" |
17 #include "chrome/common/render_messages.h" | 17 #include "chrome/common/render_messages.h" |
18 #include "chrome/common/url_constants.h" | 18 #include "chrome/common/url_constants.h" |
19 #include "chrome/renderer/extensions/chrome_v8_context.h" | 19 #include "chrome/renderer/extensions/chrome_v8_context.h" |
20 #include "chrome/renderer/extensions/extension_dispatcher.h" | 20 #include "chrome/renderer/extensions/extension_dispatcher.h" |
21 #include "chrome/renderer/extensions/miscellaneous_bindings.h" | 21 #include "chrome/renderer/extensions/miscellaneous_bindings.h" |
22 #include "chrome/renderer/extensions/schema_generated_bindings.h" | |
23 #include "chrome/renderer/extensions/user_script_idle_scheduler.h" | 22 #include "chrome/renderer/extensions/user_script_idle_scheduler.h" |
24 #include "chrome/renderer/extensions/user_script_slave.h" | 23 #include "chrome/renderer/extensions/user_script_slave.h" |
25 #include "content/public/renderer/render_view.h" | 24 #include "content/public/renderer/render_view.h" |
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" | 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" |
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
28 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques
t.h" | 27 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques
t.h" |
29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedUserGesture.
h" | 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedUserGesture.
h" |
30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
31 #include "webkit/glue/image_resource_fetcher.h" | 30 #include "webkit/glue/image_resource_fetcher.h" |
32 #include "webkit/glue/resource_fetcher.h" | 31 #include "webkit/glue/resource_fetcher.h" |
33 | 32 |
34 using extensions::MiscellaneousBindings; | 33 using extensions::MiscellaneousBindings; |
35 using extensions::SchemaGeneratedBindings; | |
36 using WebKit::WebConsoleMessage; | 34 using WebKit::WebConsoleMessage; |
37 using WebKit::WebDataSource; | 35 using WebKit::WebDataSource; |
38 using WebKit::WebFrame; | 36 using WebKit::WebFrame; |
39 using WebKit::WebURLRequest; | 37 using WebKit::WebURLRequest; |
40 using WebKit::WebScopedUserGesture; | 38 using WebKit::WebScopedUserGesture; |
41 using WebKit::WebView; | 39 using WebKit::WebView; |
42 using webkit_glue::ImageResourceFetcher; | 40 using webkit_glue::ImageResourceFetcher; |
43 using webkit_glue::ResourceFetcher; | 41 using webkit_glue::ResourceFetcher; |
44 | 42 |
45 namespace { | 43 namespace { |
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
381 routing_id(), *pending_app_info_)); | 379 routing_id(), *pending_app_info_)); |
382 pending_app_info_.reset(NULL); | 380 pending_app_info_.reset(NULL); |
383 } | 381 } |
384 | 382 |
385 void ExtensionHelper::AddErrorToRootConsole(const string16& message) { | 383 void ExtensionHelper::AddErrorToRootConsole(const string16& message) { |
386 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { | 384 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { |
387 render_view()->GetWebView()->mainFrame()->addMessageToConsole( | 385 render_view()->GetWebView()->mainFrame()->addMessageToConsole( |
388 WebConsoleMessage(WebConsoleMessage::LevelError, message)); | 386 WebConsoleMessage(WebConsoleMessage::LevelError, message)); |
389 } | 387 } |
390 } | 388 } |
OLD | NEW |