Merge 13773 - For some Indian locales, the automatic font fallback by Windows...

chrome/views/window/dialog_client_view.cc

 // Copyright (c) 2006-2008 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/views/window/dialog_client_view.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 
@@ skipping 60 matching lines @@
  private:
   Window* owner_;
   const DialogDelegate::DialogButton type_;
 
   DISALLOW_COPY_AND_ASSIGN(DialogButton);
 };
 
 }  // namespace
 
 // static
-ChromeFont DialogClientView::dialog_button_font_;
+ChromeFont* DialogClientView::dialog_button_font_ = NULL;
 static const int kDialogMinButtonWidth = 75;
 static const int kDialogButtonLabelSpacing = 16;
 static const int kDialogButtonContentSpacing = 5;
 
 // The group used by the buttons.  This name is chosen voluntarily big not to
 // conflict with other groups that could be in the dialog content.
 static const int kButtonGroup = 6666;
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView, public:
@@ skipping 254 matching lines @@
     gfx::NativeTheme::instance()->PaintStatusGripper(
         dc, SP_PANE, 1, 0, &native_bounds);
     canvas->endPlatformPaint();
   }
 }
 
 int DialogClientView::GetButtonWidth(int button) const {
   DialogDelegate* dd = GetDialogDelegate();
   std::wstring button_label = dd->GetDialogButtonLabel(
       static_cast<DialogDelegate::DialogButton>(button));
-  int string_width = dialog_button_font_.GetStringWidth(button_label);
+  int string_width = dialog_button_font_->GetStringWidth(button_label);
   return std::max(string_width + kDialogButtonLabelSpacing,
                   kDialogMinButtonWidth);
 }
 
 int DialogClientView::GetButtonsHeight() const {
   if (has_dialog_buttons()) {
     if (cancel_button_)
       return cancel_button_->height() + kDialogButtonContentSpacing;
     return ok_button_->height() + kDialogButtonContentSpacing;
   }
@@ skipping 57 matching lines @@
   DialogDelegate* dd = window()->GetDelegate()->AsDialogDelegate();
   DCHECK(dd);
   return dd;
 }
 
 // static
 void DialogClientView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    dialog_button_font_ = rb.GetFont(ResourceBundle::BaseFont);
+    dialog_button_font_ = new ChromeFont(rb.GetFont(ResourceBundle::BaseFont));
     initialized = true;
   }
 }
 
 }  // namespace views