Restore focus when infobar closes.

chrome/browser/ui/views/infobars/infobar_view.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 "chrome/browser/ui/views/infobars/infobar_view.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #endif
 
@@ skipping 315 matching lines @@
   // Cancel any menus we may have open.  It doesn't make sense to leave them
   // open while we're hidden, and if we're going to become unowned, we can't
   // allow the user to choose any options and potentially call functions that
   // try to access the owner.
   menu_runner_.reset();
 
   // It's possible to be called twice (once with |animate| true and once with it
   // false); in this case the second SetFocusManager() call will silently no-op.
   SetFocusManager(NULL);
 
-#if defined(OS_WIN) && !defined(USE_AURA)
   if (!animate)
     return;
 
   // Do not restore focus (and active state with it) if some other top-level
   // window became active.
   views::Widget* widget = GetWidget();
-  if (!widget || gfx::DoesWindowBelongToActiveWindow(widget->GetNativeView()))
+  if (!widget || widget->IsActive())
     FocusLastFocusedExternalView();
-#endif
 }
 
 void InfoBarView::PlatformSpecificOnHeightsRecalculated() {
   // Ensure that notifying our container of our size change will result in a
   // re-layout.
   InvalidateLayout();
 }
 
 void InfoBarView::GetAccessibleState(ui::AccessibleViewState* state) {
   if (delegate()) {
@@ skipping 11 matching lines @@
 void InfoBarView::OnWillChangeFocus(View* focused_before, View* focused_now) {
   views::ExternalFocusTracker::OnWillChangeFocus(focused_before, focused_now);
 
   // This will trigger some screen readers to read the entire contents of this
   // infobar.
   if (focused_before && focused_now && !Contains(focused_before) &&
       Contains(focused_now)) {
     NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
   }
 }