diff options
| author | calamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 14:42:10 +0000 |
|---|---|---|
| committer | calamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 14:42:10 +0000 |
| commit | 124901f5b506c98e87391e81f73f280e21708614 (patch) | |
| tree | 4c1c8795b112be6114eaaa5b5a93530ffef4af2e /chrome/browser/shell_integration.cc | |
| parent | cf57e1b806f36272d158c06941343dedf6b7f6a8 (diff) | |
| download | chromium_src-124901f5b506c98e87391e81f73f280e21708614.zip chromium_src-124901f5b506c98e87391e81f73f280e21708614.tar.gz chromium_src-124901f5b506c98e87391e81f73f280e21708614.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/shell_integration.cc')
| -rw-r--r-- | chrome/browser/shell_integration.cc | 2 |
1 files changed, 2 insertions, 0 deletions
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); |