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

chrome/browser/views/options/advanced_contents_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 "chrome/browser/views/options/advanced_contents_view.h"
 
 #include <windows.h>
 
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
 #include <shellapi.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "app/combobox_model.h"
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
+#include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/thread.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/gears_integration.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/options_util.h"
@@ skipping 109 matching lines @@
       text_field_background_color_(0),
       initialized_(false) {
   InitClass();
 }
 
 FileDisplayArea::~FileDisplayArea() {
 }
 
 void FileDisplayArea::SetFile(const FilePath& file_path) {
   // Force file path to have LTR directionality.
-  if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) {
+  if (base::i18n::IsRTL()) {
     string16 localized_file_path;
-    l10n_util::WrapPathWithLTRFormatting(file_path, &localized_file_path);
+    base::i18n::WrapPathWithLTRFormatting(file_path, &localized_file_path);
     text_field_->SetText(UTF16ToWide(localized_file_path));
   } else {
     text_field_->SetText(file_path.ToWStringHack());
   }
 }
 
 void FileDisplayArea::Paint(gfx::Canvas* canvas) {
   HDC dc = canvas->beginPlatformPaint();
   RECT rect = { 0, 0, width(), height() };
   gfx::NativeTheme::instance()->PaintTextField(
@@ skipping 41 matching lines @@
   text_field_->SetBackgroundColor(text_field_background_color_);
 }
 
 // static
 void FileDisplayArea::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     // We'd prefer to use UILayoutIsRightToLeft() to perform the RTL
     // environment check, but it's nonstatic, so, instead, we check whether the
     // locale is RTL.
-    bool ui_is_rtl = l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT;
+    bool ui_is_rtl = base::i18n::IsRTL();
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_folder_icon_ = *rb.GetBitmapNamed(ui_is_rtl ?
                                               IDR_FOLDER_CLOSED_RTL :
                                               IDR_FOLDER_CLOSED);
     initialized = true;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AdvancedSection
@@ skipping 525 matching lines @@
     views::Window::CreateChromeWindow(
         GetWindow()->GetNativeWindow(),
         gfx::Rect(),
         new FontsLanguagesWindowView(profile()))->Show();
   }
 }
 
 void WebContentSection::InitControlLayout() {
   AdvancedSection::InitControlLayout();
 
-  if (l10n_util::GetTextDirection() == l10n_util::LEFT_TO_RIGHT) {
+  if (!base::i18n::IsRTL()) {
     gears_label_ = new views::Label(
         l10n_util::GetString(IDS_OPTIONS_GEARSSETTINGS_GROUP_NAME));
   } else {
     // Add an RTL mark so that
     // ":" in "Google Gears:" in Hebrew Chrome is displayed left-most.
     std::wstring gearssetting_group_name =
         l10n_util::GetString(IDS_OPTIONS_GEARSSETTINGS_GROUP_NAME);
     gearssetting_group_name.push_back(
-        static_cast<wchar_t>(l10n_util::kRightToLeftMark));
+        static_cast<wchar_t>(base::i18n::kRightToLeftMark));
     gears_label_ = new views::Label(gearssetting_group_name);
   }
   gears_settings_button_ = new views::NativeButton(
       this,
       l10n_util::GetString(IDS_OPTIONS_GEARSSETTINGS_CONFIGUREGEARS_BUTTON));
   fonts_and_languages_label_ = new views::Label(
       l10n_util::GetString(IDS_OPTIONS_FONTSETTINGS_INFO));
 
   change_content_fonts_button_ = new views::NativeButton(
       this,
@@ skipping 643 matching lines @@
 
 void AdvancedScrollViewContainer::Layout() {
   gfx::Rect lb = GetLocalBounds(false);
 
   gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(
       gfx::NativeTheme::LIST);
   lb.Inset(border.width(), border.height());
   scroll_view_->SetBounds(lb);
   scroll_view_->Layout();
 }