[AiS] Added option to put a space between answer values

chrome/browser/ui/views/omnibox/omnibox_result_view.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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
 #endif
@@ skipping 179 matching lines @@
       NativeTheme::kColorId_ResultsTableSelectedDimmedText},
      gfx::INFERIOR},
     // 13 PERSONALIZED_SUGGESTION_TEXT
     {ui::ResourceBundle::BaseFont,
      {NativeTheme::kColorId_ResultsTableNormalText,
       NativeTheme::kColorId_ResultsTableHoveredText,
       NativeTheme::kColorId_ResultsTableSelectedText},
      gfx::NORMAL_BASELINE},
 };
 
-const TextStyle& GetTextStyle(size_t type) {
-  if (type > arraysize(kTextStyles))
+const TextStyle& GetTextStyle(int type) {
+  if (type < 1 || static_cast<size_t>(type) > arraysize(kTextStyles))
     type = 1;
   // Subtract one because the types are one based (not zero based).
   return kTextStyles[type - 1];
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxResultView, public:
 
@@ skipping 480 matching lines @@
     canvas->DrawImageInt(GetIcon(), GetMirroredXForRect(icon_bounds_),
                          icon_bounds_.y());
     int x = GetMirroredXForRect(text_bounds_);
     mirroring_context_->Initialize(x, text_bounds_.width());
     InitContentsRenderTextIfNecessary();
 
     if (!description_rendertext_) {
       if (match_.answer) {
         base::string16 text;
         description_rendertext_ = CreateRenderText(text);
-        for (const SuggestionAnswer::TextField& textfield :
+        for (const SuggestionAnswer::TextField& text_field :
              match_.answer->second_line().text_fields())
-          AppendAnswerText(textfield);
-        if (match_.answer->second_line().additional_text())
-          AppendAnswerText(*match_.answer->second_line().additional_text());
-        if (match_.answer->second_line().status_text())
-          AppendAnswerText(*match_.answer->second_line().status_text());
+          AppendAnswerText(text_field.text(), text_field.type());
+        const base::char16 space(' ');

[Peter Kasting, 2015/03/24 20:55:35]

Nit: I personally like const (non-pointer) locals and think they should be used
more, but I think prevailing Chromium style is to not mark them const.  You're
OK either way, just be aware of the discrepancy.

+        const auto* text_field = match_.answer->second_line().additional_text();
+        if (text_field)
+          AppendAnswerText(space + text_field->text(), text_field->type());
+        text_field = match_.answer->second_line().status_text();
+        if (text_field)
+          AppendAnswerText(space + text_field->text(), text_field->type());
       } else if (!match_.description.empty()) {
         description_rendertext_ = CreateClassifiedRenderText(
             match_.description, match_.description_class, true);
       }
     }
     PaintMatch(match_, contents_rendertext_.get(),
                description_rendertext_.get(), canvas, x);
   }
 
   AutocompleteMatch* keyword_match = match_.associated_keyword.get();
@@ skipping 29 matching lines @@
   return ui::ResourceBundle::GetSharedInstance()
       .GetFontList(GetTextStyle(1).font)
       .GetHeight();
 }
 
 int OmniboxResultView::GetContentLineHeight() const {
   return std::max(default_icon_size_ + (kMinimumIconVerticalPadding * 2),
                   GetTextHeight() + (kMinimumTextVerticalPadding * 2));
 }
 
-void OmniboxResultView::AppendAnswerText(
-    const SuggestionAnswer::TextField& text_field) {
+void OmniboxResultView::AppendAnswerText(const base::string16& text,
+                                         int text_type) {
   int offset = description_rendertext_->text().length();
-  gfx::Range range(offset, offset + text_field.text().length());
-  description_rendertext_->AppendText(text_field.text());
-  const TextStyle& text_style = GetTextStyle(text_field.type());
+  gfx::Range range(offset, offset + text.length());
+  description_rendertext_->AppendText(text);
+  const TextStyle& text_style = GetTextStyle(text_type);
   // TODO(dschuyler): follow up on the problem of different font sizes within
   // one RenderText.
   description_rendertext_->SetFontList(
       ui::ResourceBundle::GetSharedInstance().GetFontList(text_style.font));
   description_rendertext_->ApplyColor(
       GetNativeTheme()->GetSystemColor(text_style.colors[GetState()]), range);
   description_rendertext_->ApplyBaselineStyle(text_style.baseline, range);
 }