Review request: fix 7324 and 7326: missing icon and wrong path in "download location"

chrome/browser/views/options/content_page_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 <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "chrome/browser/views/options/content_page_view.h"
@@ skipping 34 matching lines @@
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // FileDisplayArea
 
 class FileDisplayArea : public views::View {
  public:
   FileDisplayArea();
   virtual ~FileDisplayArea();
 
-  void SetFile(const std::wstring& file_path);
+  void SetFile(const FilePath& file_path);
 
   // views::View overrides:
   virtual void Paint(ChromeCanvas* canvas);
   virtual void Layout();
   virtual gfx::Size GetPreferredSize();
 
  protected:
   // views::View overrides:
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
@@ skipping 21 matching lines @@
 FileDisplayArea::FileDisplayArea()
     : text_field_(new views::TextField),
       text_field_background_color_(0),
       initialized_(false) {
   InitClass();
 }
 
 FileDisplayArea::~FileDisplayArea() {
 }
 
-void FileDisplayArea::SetFile(const std::wstring& file_path) {
-  text_field_->SetText(file_path);
+void FileDisplayArea::SetFile(const FilePath& file_path) {
+  // Force file path to have LTR directionality.
+  if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) {
+    string16 localized_file_path;
+    l10n_util::WrapPathWithLTRFormatting(file_path, &localized_file_path);
+    text_field_->SetText(UTF16ToWide(localized_file_path));
+  } else {
+    text_field_->SetText(file_path.ToWStringHack());
+  }
 }
 
 void FileDisplayArea::Paint(ChromeCanvas* canvas) {
   HDC dc = canvas->beginPlatformPaint();
   RECT rect = { 0, 0, width(), height() };
   gfx::NativeTheme::instance()->PaintTextField(
       dc, EP_EDITTEXT, ETS_READONLY, 0, &rect,
       skia::SkColorToCOLORREF(text_field_background_color_), true, true);
   canvas->endPlatformPaint();
-  canvas->DrawBitmapInt(default_folder_icon_, icon_bounds_.x(),
+  // Mirror left point for icon_bounds_ to draw icon in RTL locales correctly.
+  canvas->DrawBitmapInt(default_folder_icon_,
+                        MirroredLeftPointForRect(icon_bounds_),
                         icon_bounds_.y());
 }
 
 void FileDisplayArea::Layout() {
   icon_bounds_.SetRect(kFileIconHorizontalSpacing, kFileIconVerticalSpacing,
                        kFileIconSize, kFileIconSize);
   gfx::Size ps = text_field_->GetPreferredSize();
   text_field_->SetBounds(icon_bounds_.right() + kFileIconTextFieldSpacing,
                          (height() - ps.height()) / 2,
                          width() - icon_bounds_.right() -
@@ skipping 18 matching lines @@
   AddChildView(text_field_);
   text_field_background_color_ =
       gfx::NativeTheme::instance()->GetThemeColorWithDefault(
           gfx::NativeTheme::TEXTFIELD, EP_EDITTEXT, ETS_READONLY,
           TMT_FILLCOLOR, COLOR_3DFACE);
   text_field_->SetReadOnly(true);
   text_field_->RemoveBorder();
   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;
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    default_folder_icon_ = *rb.GetBitmapNamed(IDR_FOLDER_CLOSED);
+    default_folder_icon_ = *rb.GetBitmapNamed(ui_is_rtl ?
+                                              IDR_FOLDER_CLOSED_RTL :
+                                              IDR_FOLDER_CLOSED);
     initialized = true;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ContentPageView, public:
 
 ContentPageView::ContentPageView(Profile* profile)
     : download_location_group_(NULL),
       download_default_download_location_display_(NULL),
@@ skipping 332 matching lines @@
   layout->AddView(change_content_fonts_button_);
 
   fonts_lang_group_ = new OptionsGroupView(
       contents,
       l10n_util::GetString(IDS_OPTIONS_FONTSANDLANGUAGES_GROUP_NAME),
       L"", true);
 }
 
 void ContentPageView::UpdateDownloadDirectoryDisplay() {
   download_default_download_location_display_->SetFile(
-      default_download_location_.GetValue());
+      FilePath::FromWStringHack(default_download_location_.GetValue()));
 }