Support reordering of Browser Actions within the container. Currently does no...

chrome/browser/bookmarks/bookmark_drag_data.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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/bookmarks/bookmark_drag_data.h"
 
 #include "app/clipboard/scoped_clipboard_writer.h"
 #include "base/basictypes.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 171 matching lines @@
       element.is_url = true;
       elements.push_back(element);
     }
   }
 
   return is_valid();
 }
 #endif
 
 void BookmarkDragData::WriteToPickle(Profile* profile, Pickle* pickle) const {
-#if defined(WCHAR_T_IS_UTF16)
-  pickle->WriteWString(
-      profile ? profile->GetPath().ToWStringHack() : std::wstring());
-#elif defined(WCHAR_T_IS_UTF32)
-  pickle->WriteString(
-      profile ? profile->GetPath().value() : std::string());
-#else
-  NOTIMPLEMENTED() << "Impossible encoding situation!";
-#endif
-
+  FilePath path = profile ? profile->GetPath() : FilePath();
+  FilePath::WriteStringTypeToPickle(pickle, path.value());
   pickle->WriteSize(elements.size());
 
   for (size_t i = 0; i < elements.size(); ++i)
     elements[i].WriteToPickle(pickle);
 }
 
 bool BookmarkDragData::ReadFromPickle(Pickle* pickle) {
   void* data_iterator = NULL;
   size_t element_count;
-#if defined(WCHAR_T_IS_UTF16)
-  if (pickle->ReadWString(&data_iterator, &profile_path_) &&
-#elif defined(WCHAR_T_IS_UTF32)
-  if (pickle->ReadString(&data_iterator, &profile_path_) &&
-#else
-  NOTIMPLEMENTED() << "Impossible encoding situation!";
-  if (false &&
-#endif
+  if (FilePath::ReadStringTypeFromPickle(pickle, &data_iterator,
+                                         &profile_path_) &&
       pickle->ReadSize(&data_iterator, &element_count)) {
     std::vector<Element> tmp_elements;
     tmp_elements.resize(element_count);
     for (size_t i = 0; i < element_count; ++i) {
       if (!tmp_elements[i].ReadFromPickle(pickle, &data_iterator)) {
         return false;
       }
     }
     elements.swap(tmp_elements);
   }
@@ skipping 27 matching lines @@
 
 bool BookmarkDragData::IsFromProfile(Profile* profile) const {
   // An empty path means the data is not associated with any profile.
   return (!profile_path_.empty() &&
 #if defined(WCHAR_T_IS_UTF16)
       profile->GetPath().ToWStringHack() == profile_path_);
 #elif defined(WCHAR_T_IS_UTF32)
       profile->GetPath().value() == profile_path_);
 #endif
 }