Fixed command-line to app shim in Windows app file association.

chrome/browser/web_applications/web_app_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/web_applications/web_app_win.h"
 
 #include <shlobj.h>
 
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
@@ skipping 409 matching lines @@
   chrome_cmd_line.AppendArg("%1");
 
   // Get the command-line for calling the shim (e.g.,
   // "app_shim [--chrome-sxs] -- --app-id=...").
   CommandLine shim_cmd_line(app_shim_path);
   // If this is a canary build, launch the shim in canary mode.
   if (InstallUtil::IsChromeSxSProcess())
     shim_cmd_line.AppendSwitch(installer::switches::kChromeSxS);
   // Ensure all subsequent switches are treated as args to the shim.
   shim_cmd_line.AppendArg("--");
-  for (const auto& arg : chrome_cmd_line.GetArgs())
-    shim_cmd_line.AppendArgNative(arg);
+  for (size_t i = 1; i < chrome_cmd_line.argv().size(); ++i)

[Matt Giuca, 2014/11/05 06:45:12]

Note: The old code was calling GetArgs(), which returns args but not switches.

The new code gets all the args, but starts from 0 (so it omits the program).

+    shim_cmd_line.AppendArgNative(chrome_cmd_line.argv()[i]);
 
   return shim_cmd_line;
 }
 
 // Gets the set of file extensions associated with a particular file handler.
 // Uses both the MIME types and extensions.
 void GetHandlerFileExtensions(const extensions::FileHandlerInfo& handler,
                               std::set<base::string16>* exts) {
   for (const auto& mime : handler.types) {
     std::vector<base::string16> mime_type_extensions;
@@ skipping 318 matching lines @@
 
 }  // namespace internals
 
 void UpdateShortcutForTabContents(content::WebContents* web_contents) {
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(web_contents);
   worker->Run();
 }
 
 }  // namespace web_app