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

chrome/browser/ui/cocoa/apps/native_app_window_cocoa.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.
 
 #include "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"
 
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "base/command_line.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
@@ skipping 320 matching lines @@
     : app_window_(app_window),
       has_frame_(params.frame == AppWindow::FRAME_CHROME),
       is_hidden_with_app_(false),
       is_maximized_(false),
       is_fullscreen_(false),
       is_resizable_(params.resizable),
       shows_resize_controls_(true),
       shows_fullscreen_controls_(true),
       has_frame_color_(params.has_frame_color),
       active_frame_color_(params.active_frame_color),
-      inactive_frame_color_(params.inactive_frame_color),
-      attention_request_id_(0) {
+      inactive_frame_color_(params.inactive_frame_color) {
   Observe(WebContents());
 
   base::scoped_nsobject<NSWindow> window;
   Class window_class;
   if (has_frame_) {
     window_class = has_frame_color_ ?
         [ShellCustomFrameNSWindow class] : [ShellNSWindow class];
   } else {
     window_class = [ShellFramelessNSWindow class];
   }
@@ skipping 210 matching lines @@
   NSRect frame = [window() frame];
   gfx::Rect bounds(frame.origin.x, 0, NSWidth(frame), NSHeight(frame));
   bounds.set_y(NSHeight([screen frame]) - NSMaxY(frame));
   return bounds;
 }
 
 void NativeAppWindowCocoa::Show() {
   if (is_hidden_with_app_) {
     // If there is a shim to gently request attention, return here. Otherwise
     // show the window as usual.
-    if (apps::ExtensionAppShimHandler::RequestUserAttentionForWindow(
+    if (apps::ExtensionAppShimHandler::ActivateAndRequestUserAttentionForWindow(
             app_window_)) {
       return;
     }
   }
 
   [window_controller_ showWindow:nil];
   Activate();
 }
 
 void NativeAppWindowCocoa::ShowInactive() {
@@ skipping 138 matching lines @@
         [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
     [controlRegion setFrame:NSMakeRect(iter->x(),
                                        webViewHeight - iter->bottom(),
                                        iter->width(),
                                        iter->height())];
     [webView addSubview:controlRegion];
   }
 }
 
 void NativeAppWindowCocoa::FlashFrame(bool flash) {
-  if (flash) {
-    attention_request_id_ = [NSApp requestUserAttention:NSInformationalRequest];
-  } else {
-    [NSApp cancelUserAttentionRequest:attention_request_id_];
-    attention_request_id_ = 0;
-  }
+  apps::ExtensionAppShimHandler::RequestUserAttentionForWindow(
+      app_window_,
+      flash ? apps::APP_SHIM_ATTENTION_CRITICAL
+            : apps::APP_SHIM_ATTENTION_CANCEL);
 }
 
 bool NativeAppWindowCocoa::IsAlwaysOnTop() const {
   return [window() level] == AlwaysOnTopWindowLevel();
 }
 
 void NativeAppWindowCocoa::RenderViewCreated(content::RenderViewHost* rvh) {
   if (IsActive())
     WebContents()->RestoreFocus();
 }
@@ skipping 241 matching lines @@
 }
 
 void NativeAppWindowCocoa::UpdateRestoredBounds() {
   if (IsRestored(*this))
     restored_bounds_ = [window() frame];
 }
 
 void NativeAppWindowCocoa::HideWithoutMarkingHidden() {
   [window() orderOut:window_controller_];
 }