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

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 t… 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
« no previous file with comments | « no previous file | net/base/filename_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 efc029e8bee9e81db2e9e64cc858f92ab802a262..d0a1974ff0a29d1695f6a672ae343931134efe5d 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(
davidben 2015/04/22 01:09:18 This change ought to be mirrored in https://code.g
+ base::MakeAbsoluteFilePath(base::FilePath(args[0])));
Peter Kasting 2015/04/21 22:34:05 Nit: This would probably be safer as: base::Fil
eugenebng 2015/04/23 12:01:52 I used FilePathToFileURL(base::MakeAbsoluteFilePat
}
base::StringPiece PlatformResourceProvider(int key) {
« no previous file with comments | « no previous file | net/base/filename_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698