| 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/plugins/blocked_plugin.h" | 5 #include "chrome/renderer/plugins/blocked_plugin.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/string_piece.h" | 9 #include "base/string_piece.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 #include "chrome/common/jstemplate_builder.h" | 12 #include "chrome/common/jstemplate_builder.h" |
| 13 #include "chrome/common/render_messages.h" | 13 #include "chrome/common/render_messages.h" |
| 14 #include "chrome/renderer/custom_menu_commands.h" | 14 #include "chrome/renderer/custom_menu_commands.h" |
| 15 #include "content/public/renderer/render_thread.h" | 15 #include "content/public/renderer/render_thread.h" |
| 16 #include "content/public/renderer/render_view.h" | 16 #include "content/public/renderer/render_view.h" |
| 17 #include "grit/generated_resources.h" | 17 #include "grit/generated_resources.h" |
| 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" | 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" |
| 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMenuItemInfo.h" | 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMenuItemInfo.h" |
| 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" | 21 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" |
| 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" | 22 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" |
| 23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| 24 #include "ui/base/l10n/l10n_util.h" | 24 #include "ui/base/l10n/l10n_util.h" |
| 25 #include "ui/base/resource/resource_bundle.h" | 25 #include "ui/base/resource/resource_bundle.h" |
| 26 #include "webkit/glue/webpreferences.h" | 26 #include "webkit/glue/webpreferences.h" |
| 27 #include "webkit/plugins/npapi/plugin_group.h" | 27 #include "webkit/plugins/npapi/plugin_group.h" |
| 28 #include "webkit/plugins/webview_plugin.h" | 28 #include "webkit/plugins/webview_plugin.h" |
| 29 | 29 |
| 30 using WebKit::WebContextMenuData; | 30 using WebKit::WebContextMenuData; |
| 31 using WebKit::WebFrame; | 31 using WebKit::WebFrame; |
| 32 using WebKit::WebMenuItemInfo; | 32 using WebKit::WebMenuItemInfo; |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 request.initialize(); | 233 request.initialize(); |
| 234 request.setURL(url); | 234 request.setURL(url); |
| 235 render_view()->LoadURLExternally( | 235 render_view()->LoadURLExternally( |
| 236 frame(), request, WebKit::WebNavigationPolicyNewForegroundTab); | 236 frame(), request, WebKit::WebNavigationPolicyNewForegroundTab); |
| 237 } | 237 } |
| 238 | 238 |
| 239 void BlockedPlugin::HidePlugin() { | 239 void BlockedPlugin::HidePlugin() { |
| 240 hidden_ = true; | 240 hidden_ = true; |
| 241 HidePluginInternal(); | 241 HidePluginInternal(); |
| 242 } | 242 } |
| OLD | NEW |