Preliminary work to allow Chrome to build with USE_AURA

chrome/browser/ui/views/infobars/infobar_view.cc

 // Copyright (c) 2011 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"
 
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
@@ skipping 299 matching lines @@
 }
 
 void InfoBarView::PlatformSpecificHide(bool animate) {
   // It's possible to be called twice (once with |animate| true and once with it
   // false); in this case the second RemoveFocusChangeListener() call will
   // silently no-op.
   views::FocusManager* focus_manager = GetFocusManager();
   if (focus_manager)
     focus_manager->RemoveFocusChangeListener(this);
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   if (!animate || !focus_tracker_.get())
     return;
 
   // Do not restore focus (and active state with it) if some other top-level
   // window became active.
   views::Widget* widget = GetWidget();
   if (!widget || ui::DoesWindowBelongToActiveWindow(widget->GetNativeView()))
     focus_tracker_->FocusLastFocusedExternalView();
   focus_tracker_.reset();
 #endif
@@ skipping 20 matching lines @@
 
 void InfoBarView::FocusWillChange(View* focused_before, View* 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) && GetWidget()) {
     GetWidget()->NotifyAccessibilityEvent(
         this, ui::AccessibilityTypes::EVENT_ALERT, true);
   }
 }