Use WindowActivated message instead of VisibilityChanged message to determine that Ash is the activ…

win8/metro_driver/chrome_app_view_ash.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 "win8/metro_driver/stdafx.h"
 #include "win8/metro_driver/chrome_app_view_ash.h"
 
 #include <corewindow.h>
 #include <shellapi.h>
 #include <windows.foundation.h>
@@ skipping 859 matching lines @@
   if (FAILED(hr))
     return hr;
 
   ui_channel_->Send(new MetroViewerHostMsg_Character(char_code,
                                                      status.RepeatCount,
                                                      status.ScanCode,
                                                      GetKeyboardEventFlags()));
   return S_OK;
 }
 
 HRESULT ChromeAppViewAsh::OnVisibilityChanged(

[grt (UTC plus 2), 2013/10/15 17:23:26]

is there any reason not to remove this and visibility_changed_token_?

[gab, 2013/10/15 17:53:26]

As I mentioned on the first patch set (should I state this explicitly in the CL
description):

I decided to keep this implementation around just as OnWindowActivated() was
implemented before but not used. This can perhaps be useful in the future and
leaving it here is better documentation than whatever else I have seen regarding
Metro :)!

Let me know if you still think strongly that this should go away.

[grt (UTC plus 2), 2013/10/15 19:13:19]

I feel strongly that we should not keep dead code. The OnWindowActivated
implementation did work when it was added by ananta in r196835. It looks to me
like sky forgot to remove it in r224521 when he removed the work it did.

[gab, 2013/10/15 19:18:41]

Okay, done.

     winui::Core::ICoreWindow* sender,
     winui::Core::IVisibilityChangedEventArgs* args) {
   boolean visible = false;
   HRESULT hr = args->get_Visible(&visible);
   if (FAILED(hr))
     return hr;
-
-  ui_channel_->Send(new MetroViewerHostMsg_VisibilityChanged(!!visible));
+  // We used to send MetroViewerHostMsg_VisibilityChanged to the browser process
+  // upon receiving this message to catch when Ash gets activated, but it turned
+  // out that this wasn't sufficient as Ash can be visible yet a Chrome
+  // desktop window can be active in a multiple monitor scenario, resulting in
+  // Ash not being considered as reactivated when refocused (since this message
+  // was never received as the visibility didn't change). We switched to using
+  // OnWindowActivated() below to solve this problem.
   return S_OK;
 }
 
 HRESULT ChromeAppViewAsh::OnWindowActivated(
     winui::Core::ICoreWindow* sender,
     winui::Core::IWindowActivatedEventArgs* args) {
   winui::Core::CoreWindowActivationState state;
   HRESULT hr = args->get_WindowActivationState(&state);
   if (FAILED(hr))
     return hr;
+
+  // Treat both full activation (Ash was reopened from the Start Screen or from
+  // any other Metro entry point in Windows) and pointer activation (user
+  // clicked back in Ash after using another app on another monitor) the same.
+  if (state == winui::Core::CoreWindowActivationState_CodeActivated ||
+      state == winui::Core::CoreWindowActivationState_PointerActivated) {
+    ui_channel_->Send(new MetroViewerHostMsg_WindowActivated());
+  }
   return S_OK;
 }
 
 HRESULT ChromeAppViewAsh::HandleSearchRequest(
     winapp::Activation::IActivatedEventArgs* args) {
   mswr::ComPtr<winapp::Activation::ISearchActivatedEventArgs> search_args;
   CheckHR(args->QueryInterface(
           winapp::Activation::IID_ISearchActivatedEventArgs, &search_args));
 
   if (!ui_channel_) {
@@ skipping 77 matching lines @@
   mswr::ComPtr<winapp::Core::ICoreApplicationExit> app_exit;
   CheckHR(core_app.As(&app_exit));
   globals.app_exit = app_exit.Detach();
 }
 
 IFACEMETHODIMP
 ChromeAppViewFactory::CreateView(winapp::Core::IFrameworkView** view) {
   *view = mswr::Make<ChromeAppViewAsh>().Detach();
   return (*view) ? S_OK :  E_OUTOFMEMORY;
 }