Android: Allow compiling browser without Java UI

chrome/browser/ui/webui/version_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/version_ui.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/version_handler.h"
@@ skipping 13 matching lines @@
 #include "grit/components_google_chrome_strings.h"
 #include "grit/components_resources.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "v8/include/v8.h"
 
 #if defined(ENABLE_THEMES)
 #include "chrome/browser/ui/webui/theme_source.h"
 #endif
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 #include "base/android/build_info.h"
 #include "chrome/browser/ui/android/android_about_app_info.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/webui/version_handler_chromeos.h"
 #endif
 
 using content::WebUIDataSource;
 
@@ skipping 12 matching lines @@
   html_source->AddString(version_ui::kVersionModifier,
                          chrome::GetChannelString());
   html_source->AddLocalizedString(version_ui::kOSName, IDS_VERSION_UI_OS);
   html_source->AddLocalizedString(version_ui::kPlatform, IDS_PLATFORM_LABEL);
   html_source->AddString(version_ui::kOSType, version_info::GetOSType());
   html_source->AddString(version_ui::kBlinkVersion,
                          content::GetWebKitVersion());
   html_source->AddString(version_ui::kJSEngine, "V8");
   html_source->AddString(version_ui::kJSVersion, v8::V8::GetVersion());
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   html_source->AddString(version_ui::kOSVersion,
                          AndroidAboutAppInfo::GetOsInfo());

[Ted C, 2015/11/30 19:39:05]

will want this to be OS_ANDROID at least

[no sievers, 2015/11/30 23:56:34]

Done. I reverted all changes to this file.

   html_source->AddLocalizedString(version_ui::kBuildIDName,
                                   IDS_VERSION_UI_BUILD_ID);
   html_source->AddString(version_ui::kBuildID, CHROME_BUILD_ID);
 #else
   html_source->AddString(version_ui::kOSVersion, std::string());
   html_source->AddString(version_ui::kFlashPlugin, "Flash");
   // Note that the Flash version is retrieve asynchronously and returned in
   // VersionHandler::OnGotPlugins. The area is initially blank.
   html_source->AddString(version_ui::kFlashVersion, std::string());
-#endif  // defined(OS_ANDROID)
+#endif  // defined(ANDROID_JAVA_UI)
 
   html_source->AddLocalizedString(version_ui::kCompany,
                                   IDS_ABOUT_VERSION_COMPANY_NAME);
   base::Time::Exploded exploded_time;
   base::Time::Now().LocalExplode(&exploded_time);
   html_source->AddString(
       version_ui::kCopyright,
       l10n_util::GetStringFUTF16(IDS_ABOUT_VERSION_COPYRIGHT,
                                  base::IntToString16(exploded_time.year)));
   html_source->AddLocalizedString(version_ui::kRevision,
@@ skipping 77 matching lines @@
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 #endif
 
   WebUIDataSource::Add(profile, CreateVersionUIDataSource());
 }
 
 VersionUI::~VersionUI() {
 }