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 32 matching lines @@
 typedef winfoundtn::ITypedEventHandler<
     winui::Core::CoreDispatcher*,
     winui::Core::AcceleratorKeyEventArgs*> AcceleratorKeyEventHandler;
 
 typedef winfoundtn::ITypedEventHandler<
     winui::Core::CoreWindow*,
     winui::Core::CharacterReceivedEventArgs*> CharEventHandler;
 
 typedef winfoundtn::ITypedEventHandler<
     winui::Core::CoreWindow*,
-    winui::Core::VisibilityChangedEventArgs*> VisibilityChangedHandler;
-
-typedef winfoundtn::ITypedEventHandler<
-    winui::Core::CoreWindow*,
     winui::Core::WindowActivatedEventArgs*> WindowActivatedHandler;
 
 typedef winfoundtn::ITypedEventHandler<
     winui::Core::CoreWindow*,
     winui::Core::WindowSizeChangedEventArgs*> SizeChangedHandler;
 
 // This function is exported by chrome.exe.
 typedef int (__cdecl *BreakpadExceptionHandler)(EXCEPTION_POINTERS* info);
 
 // Global information used across the metro driver.
@@ skipping 348 matching lines @@
   hr = window_->add_PointerWheelChanged(mswr::Callback<PointerEventHandler>(
       this, &ChromeAppViewAsh::OnWheel).Get(),
       &wheel_token_);
   CheckHR(hr);
 
   hr = window_->add_CharacterReceived(mswr::Callback<CharEventHandler>(
       this, &ChromeAppViewAsh::OnCharacterReceived).Get(),
       &character_received_token_);
   CheckHR(hr);
 
-  hr = window_->add_VisibilityChanged(mswr::Callback<VisibilityChangedHandler>(
-      this, &ChromeAppViewAsh::OnVisibilityChanged).Get(),
-      &visibility_changed_token_);
-  CheckHR(hr);
-
   hr = window_->add_Activated(mswr::Callback<WindowActivatedHandler>(
       this, &ChromeAppViewAsh::OnWindowActivated).Get(),
       &window_activated_token_);
   CheckHR(hr);
 
   // By initializing the direct 3D swap chain with the corewindow
   // we can now directly blit to it from the browser process.
   direct3d_helper_.Initialize(window);
   DVLOG(1) << "Initialized Direct3D.";
   return S_OK;
@@ skipping 433 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(
-    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 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;
 }