Fix some non-aura specific code related to metro startup.

chrome/browser/chrome_process_finder_win.cc

 // Copyright 2013 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/chrome_process_finder_win.h"
 
 #include <shellapi.h>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 94 matching lines @@
 NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window,
                                                 bool fast_start) {
   DCHECK(remote_window);
   static const char kSearchUrl[] =
       "http://www.google.com/search?q=%s&sourceid=chrome&ie=UTF-8";
   DWORD process_id = 0;
   DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id);
   if (!thread_id || !process_id)
     return NOTIFY_FAILED;
 
+#if !defined(USE_AURA)
   if (base::win::IsMetroProcess()) {
     // Interesting corner case. We are launched as a metro process but we
     // found another chrome running. Since metro enforces single instance then
     // the other chrome must be desktop chrome and this must be a search charm
     // activation. This scenario is unique; other cases should be properly
     // handled by the delegate_execute which will not activate a second chrome.
     string16 terms;
     base::win::MetroLaunchType launch = base::win::GetMetroLaunchParams(&terms);
     if (launch != base::win::METRO_SEARCH) {
       LOG(WARNING) << "In metro mode, but and launch is " << launch;
     } else {
       std::string query = EscapeQueryParamValue(UTF16ToUTF8(terms), true);
       std::string url = base::StringPrintf(kSearchUrl, query.c_str());
       SHELLEXECUTEINFOA sei = { sizeof(sei) };
       sei.fMask = SEE_MASK_FLAG_LOG_USAGE;
       sei.nShow = SW_SHOWNORMAL;
       sei.lpFile = url.c_str();
       OutputDebugStringA(sei.lpFile);
       sei.lpDirectory = "";
       ::ShellExecuteExA(&sei);
     }
     return NOTIFY_SUCCESS;
   }
 
   base::win::ScopedHandle process_handle;
   if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
       base::OpenProcessHandleWithAccess(
           process_id, PROCESS_QUERY_INFORMATION,
-          process_handle.Receive()) &&
-      base::win::IsProcessImmersive(process_handle.Get())) {
-    chrome::ActivateMetroChrome();
+          process_handle.Receive())) {
+    if (base::win::IsProcessImmersive(process_handle.Get()))

[rvargas (doing something else), 2013/11/05 21:07:29]

A short comment about not mixing the two if statements is in order here.

+      chrome::ActivateMetroChrome();
   }
+#endif
 
   CommandLine command_line(*CommandLine::ForCurrentProcess());
   command_line.AppendSwitchASCII(
       switches::kOriginalProcessStartTime,
       base::Int64ToString(
           base::CurrentProcessInfo::CreationTime().ToInternalValue()));
 
   if (fast_start)
     command_line.AppendSwitch(switches::kFastStart);
 
@@ skipping 29 matching lines @@
 
   // It is possible that the process owning this window may have died by now.
   if (!::IsWindow(remote_window))
     return NOTIFY_FAILED;
 
   // If the window couldn't be notified but still exists, assume it is hung.
   return NOTIFY_WINDOW_HUNG;
 }
 
 }  // namespace chrome