| Index: mojo/shell/dynamic_application_loader.cc
|
| diff --git a/mojo/shell/dynamic_application_loader.cc b/mojo/shell/dynamic_application_loader.cc
|
| index 193582b8c3344156fd3bfba615e02a5a8c38cca5..3f5eaba0ae60ca2f2e9c84aa56ee7526adbe11eb 100644
|
| --- a/mojo/shell/dynamic_application_loader.cc
|
| +++ b/mojo/shell/dynamic_application_loader.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| +#include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "mojo/common/common_type_converters.h"
|
| #include "mojo/common/data_pipe_utils.h"
|
| @@ -102,6 +103,7 @@ class DynamicApplicationLoader::LocalLoader : public Loader {
|
| base::string16 decoded_path =
|
| base::string16(output.data(), output.length());
|
| #if defined(OS_WIN)
|
| + base::TrimString(decoded_path, L"/", &decoded_path);
|
| base::FilePath path(decoded_path);
|
| #else
|
| base::FilePath path(base::UTF16ToUTF8(decoded_path));
|
|
|