Remove non USE_AURA code from views files.

chrome/browser/ui/views/dropdown_bar_host.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/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/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/path.h"
+#include "ui/gfx/scoped_sk_region.h"
 #include "ui/gfx/scrollbar_size.h"
 #include "ui/views/focus/external_focus_tracker.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/gfx/scoped_sk_region.h"
-#elif defined(OS_WIN)
-#include "base/win/scoped_gdi_object.h"
-#endif
-
-namespace {
-
-#if defined(USE_AURA)
-typedef gfx::ScopedSkRegion ScopedPlatformRegion;
-#elif defined(OS_WIN)
-typedef base::win::ScopedRegion ScopedPlatformRegion;
-#endif
-
-}  // namespace
-
 using gfx::Path;
 
 // static
 bool DropdownBarHost::disable_animations_during_testing_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // DropdownBarHost, public:
 
 DropdownBarHost::DropdownBarHost(BrowserView* browser_view)
     : browser_view_(browser_view),
@@ skipping 12 matching lines @@
   DCHECK(delegate);
 
   view_ = view;
   delegate_ = delegate;
 
   // Initialize the host.
   host_.reset(new views::Widget);
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.parent = browser_view_->GetWidget()->GetNativeView();
-#if defined(USE_AURA)
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
-#endif
   host_->Init(params);
   host_->SetContentsView(view_);
 
   SetHostViewNative(host_view);
 
   // Start listening to focus changes, so we can register and unregister our
   // own handler for Escape.
   focus_manager_ = host_->GetFocusManager();
   if (focus_manager_) {
     focus_manager_->AddFocusChangeListener(this);
@@ skipping 171 matching lines @@
   // Find the largest x and y value in the polygon.
   int max_x = 0, max_y = 0;
   for (size_t i = 0; i < arraysize(polygon); i++) {
     max_x = std::max(max_x, static_cast<int>(polygon[i].x));
     max_y = std::max(max_y, static_cast<int>(polygon[i].y));
   }
 
   // We then create the polygon and use SetWindowRgn to force the window to draw
   // only within that area. This region may get reduced in size below.
   Path path(polygon, arraysize(polygon));
-  ScopedPlatformRegion region(path.CreateNativeRegion());
+  gfx::ScopedSkRegion region(path.CreateNativeRegion());
   // Are we animating?
   if (animation_offset() > 0) {
     // The animation happens in two steps: First, we clip the window and then in
     // GetWidgetPosition we offset the window position so that it still looks
     // attached to the toolbar as it grows. We clip the window by creating a
     // rectangle region (that gradually increases as the animation progresses)
     // and find the intersection between the two regions using CombineRgn.
 
     // |y| shrinks as the animation progresses from the height of the view down
     // to 0 (and reverses when closing).
     int y = animation_offset();
     // |y| shrinking means the animation (visible) region gets larger. In other
     // words: the rectangle grows upward (when the widget is opening).
     Path animation_path;
     SkRect animation_rect = { SkIntToScalar(0), SkIntToScalar(y),
                               SkIntToScalar(max_x), SkIntToScalar(max_y) };
     animation_path.addRect(animation_rect);
-    ScopedPlatformRegion animation_region(
+    gfx::ScopedSkRegion animation_region(
         animation_path.CreateNativeRegion());
     region.Set(Path::IntersectRegions(animation_region.Get(), region.Get()));
 
     // Next, we need to increase the region a little bit to account for the
     // curved edges that the view will draw to make it look like grows out of
     // the toolbar.
     Path::Point left_curve[] = {
       {2, y+0}, {3, y+1}, {3, y+0}, {2, y+0}
     };
     Path::Point right_curve[] = {
       {w+3, y+1}, {w+4, y+0}, {w+3, y+0}, {w+3, y+1}
     };
 
     // Combine the region for the curve on the left with our main region.
     Path left_path(left_curve, arraysize(left_curve));
-    ScopedPlatformRegion r(left_path.CreateNativeRegion());
+    gfx::ScopedSkRegion r(left_path.CreateNativeRegion());
     region.Set(Path::CombineRegions(r.Get(), region.Get()));
 
     // Combine the region for the curve on the right with our main region.
     Path right_path(right_curve, arraysize(right_curve));
     region.Set(Path::CombineRegions(r.Get(), region.Get()));
   }
 
   // Now see if we need to truncate the region because parts of it obscures
   // the main window border.
   gfx::Rect widget_bounds;
@@ skipping 17 matching lines @@
     exclude[1].y = 0;
 
     exclude[2].x = max_x;               // Bottom right corner.
     exclude[2].y = max_y;
 
     exclude[3].x = max_x - difference;  // Bottom left corner.
     exclude[3].y = max_y;
 
     // Subtract this region from the original region.
     gfx::Path exclude_path(exclude, arraysize(exclude));
-    ScopedPlatformRegion exclude_region(exclude_path.CreateNativeRegion());
+    gfx::ScopedSkRegion exclude_region(exclude_path.CreateNativeRegion());
     region.Set(Path::SubtractRegion(region.Get(), exclude_region.Get()));
   }
 
   // Window takes ownership of the region.
   host()->SetShape(region.release());
 }
 
 void DropdownBarHost::RegisterAccelerators() {
   DCHECK(!esc_accel_target_registered_);
   ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE);
   focus_manager_->RegisterAccelerator(
       escape, ui::AcceleratorManager::kNormalPriority, this);
   esc_accel_target_registered_ = true;
 }
 
 void DropdownBarHost::UnregisterAccelerators() {
   DCHECK(esc_accel_target_registered_);
   ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE);
   focus_manager_->UnregisterAccelerator(escape, this);
   esc_accel_target_registered_ = false;
 }