| 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/plugins/plugin_placeholder.h" | 5 #include "chrome/renderer/plugins/plugin_placeholder.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/json/string_escape.h" | 9 #include "base/json/string_escape.h" |
| 10 #include "base/string_piece.h" | 10 #include "base/string_piece.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 using WebKit::WebPluginContainer; | 56 using WebKit::WebPluginContainer; |
| 57 using webkit::WebPluginInfo; | 57 using webkit::WebPluginInfo; |
| 58 using WebKit::WebPluginParams; | 58 using WebKit::WebPluginParams; |
| 59 using WebKit::WebPoint; | 59 using WebKit::WebPoint; |
| 60 using WebKit::WebRegularExpression; | 60 using WebKit::WebRegularExpression; |
| 61 using WebKit::WebScriptSource; | 61 using WebKit::WebScriptSource; |
| 62 using WebKit::WebString; | 62 using WebKit::WebString; |
| 63 using WebKit::WebURLRequest; | 63 using WebKit::WebURLRequest; |
| 64 using WebKit::WebVector; | 64 using WebKit::WebVector; |
| 65 using webkit::WebViewPlugin; | 65 using webkit::WebViewPlugin; |
| 66 using webkit_glue::CppArgumentList; |
| 67 using webkit_glue::CppVariant; |
| 66 | 68 |
| 67 const char* const kPluginPlaceholderDataURL = | 69 const char* const kPluginPlaceholderDataURL = |
| 68 "chrome://pluginplaceholderdata/"; | 70 "chrome://pluginplaceholderdata/"; |
| 69 | 71 |
| 70 namespace { | 72 namespace { |
| 71 const PluginPlaceholder* g_last_active_menu = NULL; | 73 const PluginPlaceholder* g_last_active_menu = NULL; |
| 72 } | 74 } |
| 73 | 75 |
| 74 // static | 76 // static |
| 75 PluginPlaceholder* PluginPlaceholder::CreateMissingPlugin( | 77 PluginPlaceholder* PluginPlaceholder::CreateMissingPlugin( |
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 RenderThread::Get()->Send( | 522 RenderThread::Get()->Send( |
| 521 new ChromeViewHostMsg_OpenAboutPlugins(routing_id())); | 523 new ChromeViewHostMsg_OpenAboutPlugins(routing_id())); |
| 522 } | 524 } |
| 523 | 525 |
| 524 void PluginPlaceholder::DidFinishLoadingCallback(const CppArgumentList& args, | 526 void PluginPlaceholder::DidFinishLoadingCallback(const CppArgumentList& args, |
| 525 CppVariant* result) { | 527 CppVariant* result) { |
| 526 finished_loading_ = true; | 528 finished_loading_ = true; |
| 527 if (message_.length() > 0) | 529 if (message_.length() > 0) |
| 528 UpdateMessage(); | 530 UpdateMessage(); |
| 529 } | 531 } |
| OLD | NEW |