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(

[gab, 2013/10/11 21:21:13]

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 :)!

     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));
   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 screen) 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;
 }