| Index: shell/filename_util.cc
|
| diff --git a/mojo/shell/filename_util.cc b/shell/filename_util.cc
|
| similarity index 69%
|
| rename from mojo/shell/filename_util.cc
|
| rename to shell/filename_util.cc
|
| index 71c511eb7b370aa0b72a2fb3c73c50d23ced687d..9ef0358aab16a80ce800555efa36bd0610015154 100644
|
| --- a/mojo/shell/filename_util.cc
|
| +++ b/shell/filename_util.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mojo/shell/filename_util.h"
|
| +#include "shell/filename_util.h"
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/path_service.h"
|
| @@ -36,22 +36,22 @@ GURL FilePathToFileURL(const base::FilePath& path) {
|
|
|
| // This must be the first substitution since others will introduce percents as
|
| // the escape character
|
| - ReplaceSubstringsAfterOffset(
|
| - &url_string, 0, FILE_PATH_LITERAL("%"), FILE_PATH_LITERAL("%25"));
|
| + ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("%"),
|
| + FILE_PATH_LITERAL("%25"));
|
|
|
| // A semicolon is supposed to be some kind of separator according to RFC 2396.
|
| - ReplaceSubstringsAfterOffset(
|
| - &url_string, 0, FILE_PATH_LITERAL(";"), FILE_PATH_LITERAL("%3B"));
|
| + ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL(";"),
|
| + FILE_PATH_LITERAL("%3B"));
|
|
|
| - ReplaceSubstringsAfterOffset(
|
| - &url_string, 0, FILE_PATH_LITERAL("#"), FILE_PATH_LITERAL("%23"));
|
| + ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("#"),
|
| + FILE_PATH_LITERAL("%23"));
|
|
|
| - ReplaceSubstringsAfterOffset(
|
| - &url_string, 0, FILE_PATH_LITERAL("?"), FILE_PATH_LITERAL("%3F"));
|
| + ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("?"),
|
| + FILE_PATH_LITERAL("%3F"));
|
|
|
| #if defined(OS_POSIX)
|
| - ReplaceSubstringsAfterOffset(
|
| - &url_string, 0, FILE_PATH_LITERAL("\\"), FILE_PATH_LITERAL("%5C"));
|
| + ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("\\"),
|
| + FILE_PATH_LITERAL("%5C"));
|
| #endif
|
|
|
| return GURL(url_string);
|
|
|