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

chrome/views/controls/tree/tree_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/controls/tree/tree_view.h"
 
 #include <shellapi.h>
 
 #include "base/win_util.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/icon_util.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/l10n_util_win.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/views/focus/focus_manager.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/theme_resources.h"
 
 namespace views {
 
 TreeView::TreeView()
     : tree_view_(NULL),
@@ skipping 316 matching lines @@
   tree_view_ = ::CreateWindowEx(WS_EX_CLIENTEDGE | GetAdditionalExStyle(),
                                 WC_TREEVIEW,
                                 L"",
                                 style,
                                 0, 0, width(), height(),
                                 parent_container, NULL, NULL, NULL);
   SetWindowLongPtr(tree_view_, GWLP_USERDATA,
                    reinterpret_cast<LONG_PTR>(&wrapper_));
   original_handler_ = win_util::SetWindowProc(tree_view_,
                                               &TreeWndProc);
+  l10n_util::AdjustUIFontForWindow(tree_view_);
+
   if (model_) {
     CreateRootItems();
     model_->SetObserver(this);
     image_list_ = CreateImageList();
     TreeView_SetImageList(tree_view_, image_list_, TVSIL_NORMAL);
   }
 
   // Bug 964884: detach the IME attached to this window.
   // We should attach IMEs only when we need to input CJK strings.
   ::ImmAssociateContextEx(tree_view_, NULL, 0);
@@ skipping 374 matching lines @@
       }
       // Fall through and let the default handler process as well.
       break;
   }
   WNDPROC handler = tree->original_handler_;
   DCHECK(handler);
   return CallWindowProc(handler, window, message, w_param, l_param);
 }
 
 }  // namespace views