Move RTL related functions from app/l10n_util to base/i18n/rtl...

views/controls/tree/tree_view.cc

 // Copyright (c) 2010 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 "views/controls/tree/tree_view.h"
 
 #include <vector>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/canvas_paint.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
+#include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
 #include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "gfx/point.h"
 #include "grit/app_resources.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
@@ skipping 368 matching lines @@
       const NodeDetails* details =
           GetNodeDetailsByID(static_cast<int>(info->item.lParam));
       if (info->item.mask & TVIF_CHILDREN)
         info->item.cChildren = model_->GetChildCount(details->node);
       if (info->item.mask & TVIF_TEXT) {
         std::wstring text = details->node->GetTitle();
         DCHECK(info->item.cchTextMax);
 
         // Adjust the string direction if such adjustment is required.
         std::wstring localized_text;
-        if (l10n_util::AdjustStringForLocaleDirection(text, &localized_text))
+        if (base::i18n::AdjustStringForLocaleDirection(text, &localized_text))
           text.swap(localized_text);
 
         wcsncpy_s(info->item.pszText, info->item.cchTextMax, text.c_str(),
                   _TRUNCATE);
       }
       // Instructs windows to cache the values for this node.
       info->item.mask |= TVIF_DI_SETITEM;
       // Return value ignored.
       return 0;
     }
@@ skipping 309 matching lines @@
   switch (message) {
     case WM_ERASEBKGND:
       return 1;
 
     case WM_PAINT: {
       gfx::CanvasPaint canvas(window);
       if (canvas.isEmpty())
         return 0;
 
       HDC dc = canvas.beginPlatformPaint();
-      if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) {
+      if (base::i18n::IsRTL()) {
         // gfx::Canvas ends up configuring the DC with a mode of GM_ADVANCED.
         // For some reason a graphics mode of ADVANCED triggers all the text
         // to be mirrored when RTL. Set the mode back to COMPATIBLE and
         // explicitly set the layout. Additionally SetWorldTransform and
         // COMPATIBLE don't play nicely together. We need to use
         // SetViewportOrgEx when using a mode of COMPATIBLE.
         //
         // Reset the transform to the identify transform. Even though
         // SetWorldTransform and COMPATIBLE don't play nicely, bits of the
         // transform still carry over when we set the mode.
         XFORM xform = {0};
         xform.eM11 = xform.eM22 = 1;
         SetWorldTransform(dc, &xform);
 
         // Set the mode and layout.
         SetGraphicsMode(dc, GM_COMPATIBLE);
         SetLayout(dc, LAYOUT_RTL);
 
         // Transform the viewport such that the origin of the dc is that of
         // the dirty region. This way when we invoke WM_PRINTCLIENT tree-view
         // draws the dirty region at the origin of the DC so that when we
         // copy the bits everything lines up nicely. Without this we end up
         // copying the upper-left corner to the redraw region.
         SetViewportOrgEx(dc, -canvas.paintStruct().rcPaint.left,
                          -canvas.paintStruct().rcPaint.top, NULL);
       }
       SendMessage(window, WM_PRINTCLIENT, reinterpret_cast<WPARAM>(dc), 0);
-      if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) {
+      if (base::i18n::IsRTL()) {
         // Reset the origin of the dc back to 0. This way when we copy the bits
         // over we copy the right bits.
         SetViewportOrgEx(dc, 0, 0, NULL);
       }
       canvas.endPlatformPaint();
       return 0;
     }
 
     case WM_RBUTTONDOWN:
       if (tree->select_on_right_mouse_down_) {
         TVHITTESTINFO hit_info;
         hit_info.pt = gfx::Point(l_param).ToPOINT();
         HTREEITEM hit_item = TreeView_HitTest(window, &hit_info);
         if (hit_item && (hit_info.flags & (TVHT_ONITEM | TVHT_ONITEMRIGHT |
                                            TVHT_ONITEMINDENT)) != 0)
           TreeView_SelectItem(tree->tree_view_, hit_item);
       }
       // 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