Get Chrome to build & link with USE_AURA on Windows again.

chrome/browser/ui/views/dropdown_bar_host.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/dropdown_bar_host.h"
 
 #include <algorithm>
 
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"
 #include "chrome/browser/ui/views/dropdown_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/scrollbar_size.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/widget.h"
 
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+#include "ui/gfx/scoped_sk_region.h"
+#elif defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "ui/base/gtk/scoped_handle_gtk.h"
-#else
-#include "ui/gfx/scoped_sk_region.h"
 #endif
 
 namespace {
 
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+typedef gfx::ScopedSkRegion ScopedPlatformRegion;
+#elif defined(OS_WIN)
 typedef base::win::ScopedRegion ScopedPlatformRegion;
 #elif defined(TOOLKIT_USES_GTK)
 typedef ui::ScopedRegion ScopedPlatformRegion;
-#else
-typedef gfx::ScopedSkRegion ScopedPlatformRegion;
 #endif
 
 }  // namespace
 
 using gfx::Path;
 
 // static
 bool DropdownBarHost::disable_animations_during_testing_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 288 matching lines @@
   focus_manager_->RegisterAccelerator(escape, this);
   esc_accel_target_registered_ = true;
 }
 
 void DropdownBarHost::UnregisterAccelerators() {
   DCHECK(esc_accel_target_registered_);
   views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false);
   focus_manager_->UnregisterAccelerator(escape, this);
   esc_accel_target_registered_ = false;
 }