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

chrome/browser/bookmarks/bookmark_drag_data.h

-// Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_H_
 
 #include <string>
 #include <vector>
 
+#include "base/file_path.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 
 // TODO(port): Port this file.
 #if defined(TOOLKIT_VIEWS)
 #include "app/os_exchange_data.h"
 #else
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
 
@@ skipping 113 matching lines @@
   bool IsFromProfile(Profile* profile) const;
 
   // The actual elements written to the clipboard.
   std::vector<Element> elements;
 
   // The MIME type for the clipboard format for BookmarkDragData.
   static const char* kClipboardFormatString;
 
  private:
   // Path of the profile we originated from.
-#if defined(WCHAR_T_IS_UTF16)
-  std::wstring profile_path_;
-#elif defined(WCHAR_T_IS_UTF32)
-  std::string profile_path_;
-#endif
+  FilePath::StringType profile_path_;
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_H_