Temporary fix for Infolist font issue.

chrome/browser/chromeos/input_method/candidate_window.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/chromeos/input_method/candidate_window.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 48 matching lines @@
 const SkColor kInfolistTitleBackgroundColor = SkColorSetRGB(0xdd, 0xdd, 0xdd);
 
 // We'll use a bigger font size, so Chinese characters are more readable
 // in the candidate window.
 #if defined(CROS_FONTS_USING_BCI)
 const int kFontSizeDelta = 1;
 #else
 const int kFontSizeDelta = 2;
 #endif
 
+// Currently the infolist window only supports Japanese font.
+#if defined(GOOGLE_CHROME_BUILD)
+const char kJapaneseFontName[] = "MotoyaG04Gothic";
+#else
+const char kJapaneseFontName[] = "IPAPGothic";
+#endif
+
 // The minimum width of candidate labels in the vertical candidate
 // window. We use this value to prevent the candidate window from being
 // too narrow when all candidates are short.
 const int kMinCandidateLabelWidth = 100;
 // The maximum width of candidate labels in the vertical candidate
 // window. We use this value to prevent the candidate window from being
 // too wide when one of candidates are long.
 const int kMaxCandidateLabelWidth = 500;
 // The minimum width of preedit area. We use this value to prevent the
 // candidate window from being too narrow when candidate lists are not shown.
@@ skipping 1204 matching lines @@
     InfolistWindowView* parent_infolist_window)
     : parent_infolist_window_(parent_infolist_window),
       title_label_(NULL),
       description_label_(NULL),
       selected_(false) {
 }
 
 void InfolistView::Init() {
   title_label_ = new views::Label;
   title_label_->SetPosition(gfx::Point(0, 0));
-  title_label_->SetFont(
-      title_label_->font().DeriveFont(kFontSizeDelta + 2));
+  title_label_->SetFont(parent_infolist_window_->GetTitleFont());
   title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   title_label_->set_border(
       views::Border::CreateEmptyBorder(4, 7, 2, 4));
 
   description_label_ = new views::Label;
   description_label_->SetPosition(gfx::Point(0, 0));
-  description_label_->SetFont(
-      description_label_->font().DeriveFont(kFontSizeDelta - 2));
+  description_label_->SetFont(parent_infolist_window_->GetDescriptionFont());
   description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   description_label_->SetMultiLine(true);
   description_label_->set_border(
       views::Border::CreateEmptyBorder(2, 17, 4, 4));
   AddChildView(title_label_);
   AddChildView(description_label_);
   UpdateLabelBackgroundColors();
 }
 
 void InfolistView::SetTitleAndDescriptionText(const string16& title,
@@ skipping 47 matching lines @@
   title_label_->SetBackgroundColor(color);
   description_label_->SetBackgroundColor(color);
 }
 
 InfolistWindowView::InfolistWindowView(views::Widget* parent_frame,
                                        views::Widget* candidate_window_frame)
     : usages_(new mozc::commands::InformationList),
       parent_frame_(parent_frame),
       candidate_window_frame_(candidate_window_frame),
       infolist_area_(NULL),
-      visible_(false) {
+      visible_(false),
+      title_font_(new gfx::Font(kJapaneseFontName, kFontSizeDelta + 15)),
+      description_font_(new gfx::Font(kJapaneseFontName, kFontSizeDelta + 11)) {
 }
 
 InfolistWindowView::~InfolistWindowView() {
   if (infolist_area_ != NULL) {
     infolist_area_->RemoveAllChildViews(false);
   }
 
   for (size_t i = 0; i < infolist_views_.size(); ++i) {
     delete infolist_views_[i];
   }
@@ skipping 169 matching lines @@
 }
 
 void InfolistWindowView::VisibilityChanged(View* starting_from,
                                            bool is_visible) {
   if (is_visible) {
     // If the visibility of candidate window is changed,
     // we should move the frame to the right position.
     ResizeAndMoveParentFrame();
   }
 }
+
 void InfolistWindowView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   View::OnBoundsChanged(previous_bounds);
   ResizeAndMoveParentFrame();
 }
 
+gfx::Font InfolistWindowView::GetTitleFont() const {
+  return *title_font_.get();
+}
+
+gfx::Font InfolistWindowView::GetDescriptionFont() const {
+  return *description_font_.get();
+}
 
 bool CandidateWindowControllerImpl::Init() {
   // Create the candidate window view.
   CreateView();
 
   // The observer should be added before Connect() so we can capture the
   // initial connection change.
   ibus_ui_controller_->AddObserver(this);
   ibus_ui_controller_->Connect();
   return true;
@@ skipping 180 matching lines @@
 }
 
 // static
 CandidateWindowController*
 CandidateWindowController::CreateCandidateWindowController() {
   return new CandidateWindowControllerImpl;
 }
 
 }  // namespace input_method
 }  // namespace chromeos