[omnibox] Cleanups: Rename OmniboxResultView method and simplify a call

This CL is just a cleanup CL that renames OmniboxResultView::Invalidate
to a more specific ApplyThemeAndRefreshIcons().

This is in preparation to refactor some of the OmniboxPopupView API
to be more friendly for a WebUI implementation.

Bug: 1046561
Change-Id: Ic082932f02d28b69e82fb35afc3d94f4e23427f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2071914Reviewed-by: Orin Jaworski <orinj@chromium.org>
Commit-Queue: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744683}

chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc

@@ -217,13 +217,9 @@ void OmniboxPopupContentsView::InvalidateLine(size_t line) {
   }
 
   OmniboxResultView* result = result_view_at(line);
-  result->Invalidate();
-
-  if (HasMatchAt(line) && GetMatchAtIndex(line).associated_keyword.get()) {
-    result->ShowKeyword(IsSelectedIndex(line) &&
-                        model_->selected_line_state() ==
-                            OmniboxPopupModel::KEYWORD);
-  }
+  result->ApplyThemeAndRefreshIcons();
+  result->ShowKeyword(IsSelectedIndex(line) && model_->selected_line_state() ==
+                                                   OmniboxPopupModel::KEYWORD);
 }
 
 void OmniboxPopupContentsView::OnSelectionStateChanged(size_t line) {

chrome/browser/ui/views/omnibox/omnibox_result_view.cc

@@ -173,7 +173,7 @@ void OmniboxResultView::SetMatch(const AutocompleteMatch& match) {
     }
   }
 
-  Invalidate();
+  ApplyThemeAndRefreshIcons();
   InvalidateLayout();
 }
 
@@ -184,7 +184,7 @@ void OmniboxResultView::ShowKeyword(bool show_keyword) {
     animation_->Hide();
 }
 
-void OmniboxResultView::Invalidate(bool force_reapply_styles) {
+void OmniboxResultView::ApplyThemeAndRefreshIcons(bool force_reapply_styles) {
   bool high_contrast =
       GetNativeTheme() && GetNativeTheme()->UsesHighContrastColors();
   // TODO(tapted): Consider using background()->SetNativeControlColor() and
@@ -324,8 +324,8 @@ OmniboxPartState OmniboxResultView::GetThemeState() const {
 }
 
 void OmniboxResultView::OnMatchIconUpdated() {
-  // The new icon will be fetched during Invalidate().
-  Invalidate();
+  // The new icon will be fetched during ApplyThemeAndRefreshIcons().
+  ApplyThemeAndRefreshIcons();
 }
 
 void OmniboxResultView::SetRichSuggestionImage(const gfx::ImageSkia& image) {
@@ -591,7 +591,7 @@ void OmniboxResultView::OnThemeChanged() {
                                 vector_icons::kCloseRoundedIcon,
                                 GetLayoutConstant(LOCATION_BAR_ICON_SIZE),
                                 GetColor(OmniboxPart::RESULTS_ICON));
-  Invalidate(true);
+  ApplyThemeAndRefreshIcons(true);
 }
 
 void OmniboxResultView::ProvideButtonFocusHint() {
@@ -637,7 +637,7 @@ gfx::Image OmniboxResultView::GetIcon() const {
 
 void OmniboxResultView::UpdateHoverState() {
   UpdateRemoveSuggestionVisibility();
-  Invalidate();
+  ApplyThemeAndRefreshIcons();
 }
 
 void OmniboxResultView::OpenMatch(WindowOpenDisposition disposition,

chrome/browser/ui/views/omnibox/omnibox_result_view.h

@@ -58,7 +58,9 @@ class OmniboxResultView : public views::View,
 
   void ShowKeyword(bool show_keyword);
 
-  void Invalidate(bool force_reapply_styles = false);
+  // Applies the current theme to the current text and widget colors.
+  // Also refreshes the icons which may need to be re-colored as well.
+  void ApplyThemeAndRefreshIcons(bool force_reapply_styles = false);
 
   // Invoked when this result view has been selected or unselected.
   void OnSelectionStateChanged();