[Mac] Bounce app shims when app windows request attention.

apps/app_shim/chrome_main_app_mode_mac.mm

 // 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.
 
 // On Mac, one can't make shortcuts with command-line arguments. Instead, we
 // produce small app bundles which locate the Chromium framework and load it,
 // passing the appropriate data. This is the entry point into the framework for
 // those app bundles.
 
 #import <Cocoa/Cocoa.h>
@@ skipping 112 matching lines @@
   virtual void OnChannelError() OVERRIDE;
 
   // If Chrome failed to launch the app, |success| will be false and the app
   // shim process should die.
   void OnLaunchAppDone(apps::AppShimLaunchResult result);
 
   // Hide this app.
   void OnHide();
 
   // Requests user attention.
   void OnRequestUserAttention();

[tapted, 2014/08/13 06:53:15]

since this shim is "always" newer, I don't think this can called any more...
remove?

[jackhou1, 2014/08/14 04:24:51]

The shim is newer, so the older Chrome might send it the old message.

[tapted, 2014/08/14 04:38:51]

ohhhhh of course..

+  void OnSetUserAttention(apps::AppShimAttentionType attention_type);
 
   // Terminates the app shim process.
   void Close();
 
   base::FilePath user_data_dir_;
   scoped_ptr<IPC::ChannelProxy> channel_;
   base::scoped_nsobject<AppShimDelegate> delegate_;
   bool launch_app_done_;
   bool ping_chrome_reply_received_;
+  NSInteger attention_request_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AppShimController);
 };
 
 AppShimController::AppShimController()
     : delegate_([[AppShimDelegate alloc] init]),
       launch_app_done_(false),
-      ping_chrome_reply_received_(false) {
+      ping_chrome_reply_received_(false),
+      attention_request_id_(0) {
   // Since AppShimController is created before the main message loop starts,
   // NSApp will not be set, so use sharedApplication.
   [[NSApplication sharedApplication] setDelegate:delegate_];
 }
 
 AppShimController::~AppShimController() {
   // Un-set the delegate since NSApplication does not retain it.
   [[NSApplication sharedApplication] setDelegate:nil];
 }
 
@@ skipping 114 matching lines @@
 void AppShimController::SendQuitApp() {
   channel_->Send(new AppShimHostMsg_QuitApp);
 }
 
 bool AppShimController::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AppShimController, message)
     IPC_MESSAGE_HANDLER(AppShimMsg_LaunchApp_Done, OnLaunchAppDone)
     IPC_MESSAGE_HANDLER(AppShimMsg_Hide, OnHide)
     IPC_MESSAGE_HANDLER(AppShimMsg_RequestUserAttention, OnRequestUserAttention)
+    IPC_MESSAGE_HANDLER(AppShimMsg_SetUserAttention, OnSetUserAttention)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void AppShimController::OnChannelError() {
   Close();
 }
 
 void AppShimController::OnLaunchAppDone(apps::AppShimLaunchResult result) {
   if (result != apps::APP_SHIM_LAUNCH_SUCCESS) {
     Close();
     return;
   }
 
   std::vector<base::FilePath> files;
   if ([delegate_ getFilesToOpenAtStartup:&files])
     SendFocusApp(apps::APP_SHIM_FOCUS_OPEN_FILES, files);
 
   launch_app_done_ = true;
 }
 
 void AppShimController::OnHide() {
   [NSApp hide:nil];
 }
 
 void AppShimController::OnRequestUserAttention() {
-  [NSApp requestUserAttention:NSInformationalRequest];
+  OnSetUserAttention(apps::APP_SHIM_ATTENTION_INFORMATIONAL);
+}
+
+void AppShimController::OnSetUserAttention(
+    apps::AppShimAttentionType attention_type) {
+  switch (attention_type) {
+    case apps::APP_SHIM_ATTENTION_CANCEL:
+      [NSApp cancelUserAttentionRequest:attention_request_id_];
+      attention_request_id_ = 0;
+      break;
+    case apps::APP_SHIM_ATTENTION_CRITICAL:
+      attention_request_id_ = [NSApp requestUserAttention:NSCriticalRequest];
+      break;
+    case apps::APP_SHIM_ATTENTION_INFORMATIONAL:
+      attention_request_id_ =
+          [NSApp requestUserAttention:NSInformationalRequest];
+    case apps::APP_SHIM_ATTENTION_NUM_TYPES:

[tapted, 2014/08/13 06:53:15]

You need a break; before this :o

[jackhou1, 2014/08/14 04:24:51]

Done.

+      NOTREACHED();
+  }
 }
 
 void AppShimController::Close() {
   [delegate_ terminateNow];
 }
 
 bool AppShimController::SendFocusApp(apps::AppShimFocusType focus_type,
                                      const std::vector<base::FilePath>& files) {
   if (launch_app_done_) {
     channel_->Send(new AppShimHostMsg_FocusApp(focus_type, files));
@@ skipping 336 matching lines @@
     // minute.
     main_message_loop.PostTask(
         FROM_HERE,
         base::Bind(&AppShimController::Init,
                    base::Unretained(&controller)));
   }
 
   main_message_loop.Run();
   return 0;
 }