Temporary fix for Infolist font issue.

chrome/browser/chromeos/input_method/candidate_window_view.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_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/input_method/ibus_ui_controller.h"
 #include "ui/views/view.h"
 

[Yusuke Sato, 2012/06/08 02:22:42]

namespace gfx { class Font; }

[horo, 2012/06/08 03:01:12]

Done.

 namespace chromeos {
 namespace input_method {
 
 class CandidateView;
 class InfolistView;
 class InformationTextArea;
 class HidableArea;
 
 // CandidateWindowView is the main container of the candidate window UI.
 class CandidateWindowView : public views::View {
@@ skipping 199 matching lines @@
  public:
   InfolistWindowView(views::Widget* parent_frame,
                      views::Widget* candidate_window_frame);
   virtual ~InfolistWindowView();
   void Init();
   void Show();
   void DelayShow(unsigned int milliseconds);
   void Hide();
   void DelayHide(unsigned int milliseconds);
   void UpdateCandidates(const InputMethodLookupTable& lookup_table);
-
   void ResizeAndMoveParentFrame();
+  gfx::Font GetTitleFont();

[Yusuke Sato, 2012/06/08 02:22:42]

const; ?

[Yusuke Sato, 2012/06/08 02:22:42]

I briefly checked ui/gfx/platform_font_pango.h. Looks like copying gfx::Font by
value is not that cheap. How about returning a const reference to the object?

[horo, 2012/06/08 03:01:12]

Done.

[horo, 2012/06/08 03:01:12]

Copying gfx::Font by value does not causes copying PlatformFont by value.
It causes only AddRef().

ui/gfx/font.h
// Font provides a wrapper around an underlying font. Copy and assignment
// operators are explicitly allowed, and cheap.

coped_refptr<PlatformFont> platform_font_;

+  gfx::Font GetDescriptionFont();

[Yusuke Sato, 2012/06/08 02:22:42]

ditto.

[horo, 2012/06/08 03:01:12]

Done.

 
  protected:
   // Override View::VisibilityChanged()
   virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE;
 
   // Override View::OnBoundsChanged()
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(InfolistWindowViewTest, ShouldUpdateViewTest);
@@ skipping 17 matching lines @@
   std::vector<InfolistView*> infolist_views_;
 
   bool visible_;
 
   base::OneShotTimer<InfolistWindowView> show_hide_timer_;
 
   static bool ShouldUpdateView(
     const mozc::commands::InformationList* old_usages,
     const mozc::commands::InformationList* new_usages);
 
+  // Information title font
+  scoped_ptr<gfx::Font> title_font_;
+  // Information description font
+  scoped_ptr<gfx::Font> description_font_;
+
   DISALLOW_COPY_AND_ASSIGN(InfolistWindowView);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_