Use ANDROID_JAVA_UI build flag for UI elements in Chrome dir

chrome/browser/ui/autofill/autofill_popup_controller_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_
 
 #include <stddef.h>
 
 #include "base/gtest_prod_util.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/popup_controller_common.h"
+#include "chrome/common/features.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 namespace autofill {
 
 class AutofillPopupDelegate;
 class AutofillPopupView;
 
 // This class is a controller for an AutofillPopupView. It implements
@@ skipping 58 matching lines @@
   bool IsRTL() const override;
 
   size_t GetLineCount() const override;
   const autofill::Suggestion& GetSuggestionAt(size_t row) const override;
   const base::string16& GetElidedValueAt(size_t row) const override;
   const base::string16& GetElidedLabelAt(size_t row) const override;
   bool GetRemovalConfirmationText(int list_index,
                                   base::string16* title,
                                   base::string16* body) override;
   bool RemoveSuggestion(int list_index) override;
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(ANDROID_JAVA_UI)
   const gfx::FontList& GetValueFontListForRow(size_t index) const override;
   const gfx::FontList& GetLabelFontList() const override;
 #endif
   int selected_line() const override;
 
   content::WebContents* web_contents();
 
   // Change which line is currently selected by the user.
   void SetSelectedLine(int selected_line);
 
@@ skipping 22 matching lines @@
   // without showing the popup.
   void SetValues(const std::vector<autofill::Suggestion>& suggestions);
 
   AutofillPopupView* view() { return view_; }
 
   // |view_| pass throughs (virtual for testing).
   virtual void ShowView();
   virtual void InvalidateRow(size_t row);
 
   // Protected so tests can access.
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(ANDROID_JAVA_UI)

[Evan Stade, 2016/01/09 00:03:02]

imo this is sort of hard to read. On the one hand, it makes sense that Windows
doesn't define ANDROID_JAVA_UI but on the other hand, this looks like something
that should only be relevant to android. This is more readable if you ask me:

if !(defined(OS_ANDROID) && BUILDFLAG(ANDROID_JAVA_UI))

This is longer so it's understandable if you don't like it. Just my two cents.

[bshe, 2016/01/11 15:52:02]

I see your point. It is indeed more clear but longer. There were other places
that use the same
short version. So I would lean toward to keep it as it is if you dont mind.
Since the flag has
ANDROD in it, so it shouldn't be too hard to associated the flag with ANDROID
platform only.

   // Calculates the desired width of the popup based on its contents.
   int GetDesiredPopupWidth() const;
 
   // Calculates the desired height of the popup based on its contents.
   int GetDesiredPopupHeight() const;
 
   // Calculate the width of the row, excluding all the text. This provides
   // the size of the row that won't be reducible (since all the text can be
   // elided if there isn't enough space).
   int RowWidthWithoutText(int row) const;
 #endif
 
   base::WeakPtr<AutofillPopupControllerImpl> GetWeakPtr();
 
   // Contains common popup functionality such as popup layout. Protected for
   // testing.
   scoped_ptr<PopupControllerCommon> controller_common_;
 
  private:
   // Clear the internal state of the controller. This is needed to ensure that
   // when the popup is reused it doesn't leak values between uses.
   void ClearState();
 
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(ANDROID_JAVA_UI)
   // Calculates and sets the bounds of the popup, including placing it properly
   // to prevent it from going off the screen.
   void UpdatePopupBounds();
 #endif
 
   AutofillPopupView* view_;  // Weak reference.
   base::WeakPtr<AutofillPopupDelegate> delegate_;
 
   // The bounds of the Autofill popup.
   gfx::Rect popup_bounds_;
 
   // The text direction of the popup.
   base::i18n::TextDirection text_direction_;
 
   // The current Autofill query values.
   std::vector<autofill::Suggestion> suggestions_;
 
   // Elided values and labels corresponding to the suggestions_ vector to
   // ensure that it fits on the screen.
   std::vector<base::string16> elided_values_;
   std::vector<base::string16> elided_labels_;
 
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(ANDROID_JAVA_UI)
   // The fonts for the popup text.
   gfx::FontList value_font_list_;
   gfx::FontList label_font_list_;
   gfx::FontList warning_font_list_;
   gfx::FontList title_font_list_;
 #endif
 
   // The line that is currently selected by the user.
   // |kNoSelection| indicates that no line is currently selected.
   int selected_line_;
 
   base::WeakPtrFactory<AutofillPopupControllerImpl> weak_ptr_factory_;
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_