Get rid of FromWStringHack in select_file_dialog.cc

chrome/browser/ui/views/select_file_dialog.cc

 // Copyright (c) 2011 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/shell_dialogs.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
@@ skipping 233 matching lines @@
       // Bad json value returned.
       NOTREACHED();
     } else {
       const DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
       if (delegate->type_ == SELECT_OPEN_FILE ||
           delegate->type_ == SELECT_SAVEAS_FILE ||
           delegate->type_ == SELECT_FOLDER) {
         std::string path_string;
         if (dict->HasKey(kKeyNamePath) &&
             dict->GetString(kKeyNamePath, &path_string)) {
-          FilePath path = FilePath::FromWStringHack(UTF8ToWide(path_string));
-
+#if defined(OS_WIN)
+          FilePath path(base::SysUTF8ToWide(path_string));
+#elif defined(OS_CHROMEOS) || (TOOLKIT_VIEWS)

[evanm, 2011/01/13 00:58:54]

I think you meant
  defined(TOOLKIT_VIEWS)
on the right side.

But I'd say instead just use a plain "#else", less chance of a mistake.

[tfarina, 2011/01/13 02:07:07]

Oh, yeah, got distracted. Using #else now. PTAL!

+          FilePath path(
+              base::SysWideToNativeMB(base::SysUTF8ToWide(path_string)));
+#endif
           listener_->FileSelected(path, kSaveCompletePageIndex,
                                   delegate->params_);
           notification_fired = true;
         }
       } else if (delegate->type_ == SELECT_OPEN_MULTI_FILE) {
         ListValue* paths_value = NULL;
         if (dict->HasKey(kKeyNamePath) &&
             dict->GetList(kKeyNamePath, &paths_value) &&
             paths_value) {
           std::vector<FilePath> paths;
           paths.reserve(paths_value->GetSize());
           for (size_t i = 0; i < paths_value->GetSize(); ++i) {
             std::string path_string;
             if (paths_value->GetString(i, &path_string) &&
                 !path_string.empty()) {
-              paths.push_back(FilePath::FromWStringHack(
-                  UTF8ToWide(path_string)));
+#if defined(OS_WIN)
+              FilePath path(base::SysUTF8ToWide(path_string));
+#elif defined(OS_CHROMEOS) || (TOOLKIT_VIEWS)
+              FilePath path(
+                  base::SysWideToNativeMB(base::SysUTF8ToWide(path_string)));
+#endif
+              paths.push_back(path);
             }
           }
 
           listener_->MultiFilesSelected(paths, delegate->params_);
           notification_fired = true;
         }
       } else {
         NOTREACHED();
       }
     }
@@ skipping 183 matching lines @@
     // TODO(xiyuan): Change this when the infrastructure is improved.
     HtmlDialogUIDelegate** delegate = HtmlDialogUI::GetPropertyAccessor().
         GetProperty(dom_ui_->tab_contents()->property_bag());
     HtmlDialogView* containing_view = static_cast<HtmlDialogView*>(*delegate);
     DCHECK(containing_view);
 
     containing_view->GetWindow()->UpdateWindowTitle();
     containing_view->GetWindow()->GetNonClientView()->SchedulePaint();
   }
 }