Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(708)

Unified Diff: content/shell/browser/shell_browser_main_parts.cc

Issue 1068793002: Fixed "blocking io" from FixupPath on UI thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed adding cwd aka "blocking IO" used in FixupURL via FilePathToFileURL, also fixed client code Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell_browser_main_parts.cc
diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc
index 750d70eef1b37a520dc0345984a1ca1b3052f593..68f52e2b4d688284ceb36670d6942be27107631b 100644
--- a/content/shell/browser/shell_browser_main_parts.cc
+++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/files/file_util.h"
#include "base/message_loop/message_loop.h"
#include "base/threading/thread.h"
#include "base/threading/thread_restrictions.h"
@@ -64,7 +65,8 @@ GURL GetStartupURL() {
if (url.is_valid() && url.has_scheme())
return url;
- return net::FilePathToFileURL(base::FilePath(args[0]));
+ return net::FilePathToFileURL(
+ base::MakeAbsoluteFilePath(base::FilePath(args[0])));
}
base::StringPiece PlatformResourceProvider(int key) {

Powered by Google App Engine
This is Rietveld 408576698