Get rid of FromWStringHack in select_file_dialog.cc

base/values.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "base/values.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 
 namespace {
@@ skipping 100 matching lines @@
 }
 
 bool Value::GetAsString(std::string* out_value) const {
   return false;
 }
 
 bool Value::GetAsString(string16* out_value) const {
   return false;
 }
 
+bool Value::GetAsFilePath(FilePath* out_value) const {
+  return false;
+}
+
 bool Value::GetAsList(ListValue** out_value) {
   return false;
 }
 
 Value* Value::DeepCopy() const {
   // This method should only be getting called for null Values--all subclasses
   // need to provide their own implementation;.
   DCHECK(IsType(TYPE_NULL));
   return CreateNullValue();
 }
@@ skipping 122 matching lines @@
   return CreateStringValue(value_);
 }
 
 bool StringValue::Equals(const Value* other) const {
   if (other->GetType() != GetType())
     return false;
   std::string lhs, rhs;
   return GetAsString(&lhs) && other->GetAsString(&rhs) && lhs == rhs;
 }
 
+///////////////////// FilePathValue ////////////////////////////////////////////
+
+FilePathValue::FilePathValue(const FilePath& in_value)
+    : Value(TYPE_PATH),
+      value_(in_value) {
+}
+
+FilePathValue::~FilePathValue() {
+}
+
+bool FilePathValue::GetAsFilePath(FilePath* out_value) const {
+  if (out_value)
+    *out_value = value_;
+  return true;
+}
+
+bool FilePathValue::Equals(const Value* other) const {
+  if (other->GetType() != GetType())
+    return false;
+  FilePath lhs, rhs;
+  return GetAsFilePath(&lhs) && other->GetAsFilePath(&rhs) && lhs == rhs;
+}
+
 ///////////////////// BinaryValue ////////////////////
 
 BinaryValue::~BinaryValue() {
   DCHECK(buffer_);
   if (buffer_)
     delete[] buffer_;
 }
 
 // static
 BinaryValue* BinaryValue::Create(char* buffer, size_t size) {
@@ skipping 230 matching lines @@
   bool result = Get(path, &value);
   if (!result || !value->IsType(TYPE_LIST))
     return false;
 
   if (out_value)
     *out_value = static_cast<ListValue*>(value);
 
   return true;
 }
 
+bool DictionaryValue::GetFilePath(const std::string& path,
+                                  FilePath* out_value) const {
+  Value* value;
+  if (!Get(path, &value))
+    return false;
+
+  return value->GetAsFilePath(out_value);
+}
+
 bool DictionaryValue::GetWithoutPathExpansion(const std::string& key,
                                               Value** out_value) const {
   DCHECK(IsStringUTF8(key));
   ValueMap::const_iterator entry_iterator = dictionary_.find(key);
   if (entry_iterator == dictionary_.end())
     return false;
 
   Value* entry = entry_iterator->second;
   if (out_value)
     *out_value = entry;
@@ skipping 271 matching lines @@
   bool result = Get(index, &value);
   if (!result || !value->IsType(TYPE_LIST))
     return false;
 
   if (out_value)
     *out_value = static_cast<ListValue*>(value);
 
   return true;
 }
 
+bool ListValue::GetFilePath(size_t index, FilePath* out_value) const {
+  Value* value;
+  if (!Get(index, &value))
+    return false;
+
+  return value->GetAsFilePath(out_value);
+}
+
 bool ListValue::Remove(size_t index, Value** out_value) {
   if (index >= list_.size())
     return false;
 
   if (out_value)
     *out_value = list_[index];
   else
     delete list_[index];
 
   list_.erase(list_.begin() + index);
@@ skipping 70 matching lines @@
       return false;
   }
   if (lhs_it != end() || rhs_it != other_list->end())
     return false;
 
   return true;
 }
 
 ValueSerializer::~ValueSerializer() {
 }