Manually merging remaining Win8 changes.

win8/metro_driver/chrome_url_launch_handler.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 "stdafx.h"
 #include "chrome_url_launch_handler.h"
 #include "chrome_app_view.h"
 
 #include <assert.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <string>
 
-#include "base/string_tokenizer.h"
+#include "base/command_line.h"
 
 #include "winrt_utils.h"
 
 typedef winfoundtn::ITypedEventHandler<
     winapp::Search::SearchPane*,
     winapp::Search::SearchPaneQuerySubmittedEventArgs*> QuerySubmittedHandler;
 
 ChromeUrlLaunchHandler::ChromeUrlLaunchHandler() {
   globals.is_initial_activation = true;
   globals.initial_activation_kind = winapp::Activation::ActivationKind_Launch;
@@ skipping 65 matching lines @@
   uri->get_AbsoluteUri(url.GetAddressOf());
   string16 actual_url(MakeStdWString(url.Get()));
   globals.navigation_url = actual_url;
 
   // If this is the initial activation then we wait for Chrome to initiate the
   // navigation. In all other cases navigate right away.
   if (!globals.is_initial_activation)
     InitiateNavigationOrSearchRequest(globals.navigation_url.c_str(), 0);
 }
 
-// The LaunchArgs are in a semi-color separated key_name=key_value list. At
-// the moment the only key_name understaood is "url".
+// |launch_args| is an encoded command line, minus the executable name. To
+// find the URL to launch the first argument is used. If any other parameters
+// are encoded in |launch_args| they are ignored.
 string16 ChromeUrlLaunchHandler::GetUrlFromLaunchArgs(
     const string16& launch_args) {
-  WStringTokenizer tokenizer(launch_args, L";=");
-  bool next_is_url = false;
-  while (tokenizer.GetNext()) {
-    if (next_is_url)
-      return tokenizer.token();
-    if (tokenizer.token() == L"url")
-      next_is_url = true;
-  }
-  if (launch_args == L"opennewwindow") {
-    DVLOG(1) << "Returning new tab url";
-    return L"chrome://newtab";
-  }
+  string16 dummy_command_line(L"dummy.exe ");
+  dummy_command_line.append(launch_args);
+  CommandLine command_line = CommandLine::FromString(dummy_command_line);
+  CommandLine::StringVector args = command_line.GetArgs();
+  if (args.size() > 0)
+    return args[0];
+
   return string16();
 }
 
 void ChromeUrlLaunchHandler::HandleLaunch(
     winapp::Activation::ILaunchActivatedEventArgs* args) {
   mswrw::HString launch_args;
   args->get_Arguments(launch_args.GetAddressOf());
   string16 actual_launch_args(MakeStdWString(launch_args.Get()));
   globals.navigation_url = GetUrlFromLaunchArgs(actual_launch_args);
   DVLOG(1) << __FUNCTION__ << ", launch_args=" << actual_launch_args
@@ skipping 66 matching lines @@
   if (url) {
     VLOG(1) << "Posting url:" << url;
     PostMessage(globals.host_windows.front().first, navigation_search_message,
                 reinterpret_cast<WPARAM>(url), 0);
   } else {
     VLOG(1) << "Posting search string:" << search_string;
     PostMessage(globals.host_windows.front().first, navigation_search_message,
                 0, reinterpret_cast<LPARAM>(search_string));
   }
 }