Index: chrome/browser/ui/webui/version_handler.cc |
diff --git a/chrome/browser/ui/webui/version_handler.cc b/chrome/browser/ui/webui/version_handler.cc |
index 635fdb4d4ab5ec39705d822c42cff1c1a0c6bc57..c31e64560cbb625611b7d6061c691ce9b481eee4 100644 |
--- a/chrome/browser/ui/webui/version_handler.cc |
+++ b/chrome/browser/ui/webui/version_handler.cc |
@@ -61,11 +61,13 @@ void VersionHandler::RegisterMessages() { |
} |
void VersionHandler::HandleRequestVersionInfo(const ListValue* args) { |
+#if defined(ENABLE_PLUGINS) |
// The Flash version information is needed in the response, so make sure |
// the plugins are loaded. |
content::PluginService::GetInstance()->GetPlugins( |
base::Bind(&VersionHandler::OnGotPlugins, |
weak_ptr_factory_.GetWeakPtr())); |
+#endif |
// Grab the executable path on the FILE thread. It is returned in |
// OnGotFilePaths. |
@@ -126,7 +128,6 @@ void VersionHandler::OnGotFilePaths(string16* executable_path_data, |
void VersionHandler::OnGotPlugins( |
jam
2012/12/19 01:55:15
seems that this function should be wrapped as well
nilesh
2012/12/19 21:07:44
Yes. I am relying on the linker not including this
jam
2012/12/19 21:23:10
yes I think it would be good to remove that as wel
nilesh
2012/12/19 21:47:25
ifdefed the method.
I have tried android (debug/r
|
const std::vector<webkit::WebPluginInfo>& plugins) { |
-#if !defined(OS_ANDROID) |
// Obtain the version of the first enabled Flash plugin. |
std::vector<webkit::WebPluginInfo> info_array; |
content::PluginService::GetInstance()->GetPluginInfoArray( |
@@ -146,5 +147,4 @@ void VersionHandler::OnGotPlugins( |
StringValue arg(flash_version); |
web_ui()->CallJavascriptFunction("returnFlashVersion", arg); |
-#endif |
} |