Remove more 'using' declarations of Scoped* from scoped_handle_win.h

chrome/browser/ui/views/dropdown_bar_host.cc

 // Copyright (c) 2010 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/views/dropdown_bar_host.h"
 
 #include "app/keyboard_codes.h"
 #include "app/slide_animation.h"
-#include "base/scoped_handle.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/dropdown_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "gfx/path.h"
 #include "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_LINUX)
+#if defined(OS_WIN)
+#include "base/win/scoped_gdi_object.h"
+#elif defined(OS_LINUX)
 #include "app/scoped_handle_gtk.h"
 #endif
 
 using gfx::Path;
 
 // static
 bool DropdownBarHost::disable_animations_during_testing_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // DropdownBarHost, public:
@@ skipping 174 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));
+#if defined(OS_WIN)

[brettw, 2010/12/29 20:40:34]

All of these new ifdefs in this file are disappointing. How about making a
typedef in an anonymous namespace for ScopedPlatformRegion that uses either the
Linux or Windows one? Then you can use that later on and remove the ifdefs.

[tfarina, 2010/12/29 20:58:06]

Done. PTAL!

+  base::win::ScopedRegion region(path.CreateNativeRegion());
+#elif defined(OS_LINUX)
   ScopedRegion region(path.CreateNativeRegion());
-
+#endif
   // 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);
-    ScopedRegion animation_region(animation_path.CreateNativeRegion());
+#if defined(OS_WIN)
+    base::win::ScopedRegion animation_region(
+        animation_path.CreateNativeRegion());
+#elif defined(OS_LINUX)
+    ScopedRegion animation_region(
+        animation_path.CreateNativeRegion());
+#endif
     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[] = {
       {0, y+0}, {0, y+1}, {2, y+3}, {2, y+0}, {0, y+0}
     };
     Path::Point right_curve[] = {
       {w+3, y+3}, {w+6, y+0}, {w+3, y+0}, {w+3, y+3}
     };
 
     // Combine the region for the curve on the left with our main region.
     Path left_path(left_curve, arraysize(left_curve));
+#if defined(OS_WIN)
+    base::win::ScopedRegion r(left_path.CreateNativeRegion());
+#elif defined(OS_LINUX)
     ScopedRegion r(left_path.CreateNativeRegion());
+#endif
     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));
+#if defined(OS_WIN)
+    base::win::ScopedRegion exclude_region(exclude_path.CreateNativeRegion());
+#elif defined(OS_LINUX)
     ScopedRegion exclude_region(exclude_path.CreateNativeRegion());
+#endif
     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_);
   views::Accelerator escape(app::VKEY_ESCAPE, false, false, false);
   focus_manager_->RegisterAccelerator(escape, this);
   esc_accel_target_registered_ = true;
 }
 
 void DropdownBarHost::UnregisterAccelerators() {
   DCHECK(esc_accel_target_registered_);
   views::Accelerator escape(app::VKEY_ESCAPE, false, false, false);
   focus_manager_->UnregisterAccelerator(escape, this);
   esc_accel_target_registered_ = false;
 }