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

app/gfx/canvas.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 "app/gfx/canvas.h"
 
 #include <limits>
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
+#include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace gfx {
 
 bool Canvas::GetClipRect(gfx::Rect* r) {
   SkRect clip;
   if (!getClipBounds(&clip)) {
     if (r)
@@ skipping 190 matching lines @@
 
   // The rect will be filled by the bitmap.
   drawRect(dest_rect, p);
 }
 
 void Canvas::DrawStringInt(const std::wstring& text,
                            const gfx::Font& font,
                            const SkColor& color,
                            int x, int y, int w, int h) {
   DrawStringInt(text, font, color, x, y, w, h,
-                l10n_util::DefaultCanvasTextAlignment());
+                gfx::Canvas::DefaultCanvasTextAlignment());
 }
 
 void Canvas::DrawStringInt(const std::wstring& text,
                            const gfx::Font& font,
                            const SkColor& color,
                            const gfx::Rect& display_rect) {
   DrawStringInt(text, font, color, display_rect.x(), display_rect.y(),
                 display_rect.width(), display_rect.height());
 }
 
@@ skipping 28 matching lines @@
   const SkBitmap& device_bitmap = getDevice()->accessBitmap(false);
 
   // Make a bitmap to return, and a canvas to draw into it. We don't just want
   // to call extractSubset or the copy constuctor, since we want an actual copy
   // of the bitmap.
   SkBitmap result;
   device_bitmap.copyTo(&result, SkBitmap::kARGB_8888_Config);
   return result;
 }
 
+// static
+int Canvas::DefaultCanvasTextAlignment() {
+  if (!base::i18n::IsRTL())
+    return gfx::Canvas::TEXT_ALIGN_LEFT;
+  return gfx::Canvas::TEXT_ALIGN_RIGHT;
+}
+
 }  // namespace gfx