| 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 f2dd9706447ac7ae161c27eecd2ff7d19d57a7cb..bea5fad951372f321d58a2a2d105788331062de4 100644
|
| --- a/chrome/browser/ui/webui/version_handler.cc
|
| +++ b/chrome/browser/ui/webui/version_handler.cc
|
| @@ -22,6 +22,7 @@
|
| #include "content/public/browser/plugin_service.h"
|
| #include "content/public/browser/web_ui.h"
|
| #include "content/public/common/content_constants.h"
|
| +#include "ppapi/features/features.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -64,7 +65,7 @@ void VersionHandler::RegisterMessages() {
|
| }
|
|
|
| void VersionHandler::HandleRequestVersionInfo(const base::ListValue* args) {
|
| -#if defined(ENABLE_PLUGINS)
|
| +#if BUILDFLAG(ENABLE_PLUGINS)
|
| // The Flash version information is needed in the response, so make sure
|
| // the plugins are loaded.
|
| content::PluginService::GetInstance()->GetPlugins(
|
| @@ -101,7 +102,7 @@ void VersionHandler::OnGotFilePaths(base::string16* executable_path_data,
|
| exec_path, profile_path);
|
| }
|
|
|
| -#if defined(ENABLE_PLUGINS)
|
| +#if BUILDFLAG(ENABLE_PLUGINS)
|
| void VersionHandler::OnGotPlugins(
|
| const std::vector<content::WebPluginInfo>& plugins) {
|
| // Obtain the version of the first enabled Flash plugin.
|
| @@ -124,4 +125,4 @@ void VersionHandler::OnGotPlugins(
|
| base::StringValue arg(flash_version);
|
| web_ui()->CallJavascriptFunctionUnsafe(version_ui::kReturnFlashVersion, arg);
|
| }
|
| -#endif // defined(ENABLE_PLUGINS)
|
| +#endif // BUILDFLAG(ENABLE_PLUGINS)
|
|
|