From 124901f5b506c98e87391e81f73f280e21708614 Mon Sep 17 00:00:00 2001 From: "calamity@chromium.org" Date: Wed, 27 Mar 2013 14:42:10 +0000 Subject: Move v2 app pinning to correct thread DCHECK was being thrown by ShellIntegration::CommandLineArgsForLauncher when --user-data-dir flag was present. Added a thread restriction check to ShellIntegration::CommandLineArgsForLauncher so others won't make the same mistake. BUG=224065 Review URL: https://chromiumcodereview.appspot.com/13078003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190933 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/shell_integration.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'chrome/browser/shell_integration.cc') diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc index ba67750..ff0ec58 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc @@ -10,6 +10,7 @@ #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/string_util.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/policy/policy_path_parser.h" #include "chrome/common/chrome_paths.h" @@ -61,6 +62,7 @@ CommandLine ShellIntegration::CommandLineArgsForLauncher( const GURL& url, const std::string& extension_app_id, const base::FilePath& profile_path) { + base::ThreadRestrictions::AssertIOAllowed(); const CommandLine& cmd_line = *CommandLine::ForCurrentProcess(); CommandLine new_cmd_line(CommandLine::NO_PROGRAM); -- cgit v1.1