OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/blocked_plugin.h" | 5 #include "chrome/renderer/blocked_plugin.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/string_piece.h" | 10 #include "base/string_piece.h" |
| 11 #include "base/values.h" |
11 #include "chrome/common/jstemplate_builder.h" | 12 #include "chrome/common/jstemplate_builder.h" |
12 #include "chrome/common/notification_service.h" | 13 #include "chrome/common/notification_service.h" |
13 #include "chrome/common/plugin_group.h" | 14 #include "chrome/common/plugin_group.h" |
14 #include "chrome/common/render_messages.h" | 15 #include "chrome/common/render_messages.h" |
15 #include "chrome/renderer/render_view.h" | 16 #include "chrome/renderer/render_view.h" |
16 #include "grit/generated_resources.h" | 17 #include "grit/generated_resources.h" |
17 #include "grit/renderer_resources.h" | 18 #include "grit/renderer_resources.h" |
18 #include "third_party/WebKit/WebKit/chromium/public/WebData.h" | 19 #include "third_party/WebKit/WebKit/chromium/public/WebData.h" |
19 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" | 20 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" |
20 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h" | 21 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h" |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 if (new_plugin && new_plugin->initialize(container)) { | 124 if (new_plugin && new_plugin->initialize(container)) { |
124 container->setPlugin(new_plugin); | 125 container->setPlugin(new_plugin); |
125 plugin_->ReplayReceivedData(new_plugin); | 126 plugin_->ReplayReceivedData(new_plugin); |
126 container->invalidate(); | 127 container->invalidate(); |
127 container->reportGeometry(); | 128 container->reportGeometry(); |
128 plugin_->destroy(); | 129 plugin_->destroy(); |
129 render_view_->Send( | 130 render_view_->Send( |
130 new ViewHostMsg_BlockedPluginLoaded(render_view_->routing_id())); | 131 new ViewHostMsg_BlockedPluginLoaded(render_view_->routing_id())); |
131 } | 132 } |
132 } | 133 } |
OLD | NEW |