Revert 30903 - Gets find bar animation/clipping to work on views/gtk.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/340077

TBR=sky@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30913 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 1 insertions, 60 deletions

diff --git a/base/base.gyp b/base/base.gyp
index b79568d..7ead978 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -253,7 +253,6 @@
         'scoped_cftyperef.h',
         'scoped_comptr_win.h',
         'scoped_handle.h',
-        'scoped_handle_gtk.h',
         'scoped_handle_win.h',
         'scoped_nsautorelease_pool.h',
         'scoped_nsautorelease_pool.mm',
diff --git a/base/scoped_handle.h b/base/scoped_handle.h
index 913271d6..e53b2dd 100644
--- a/base/scoped_handle.h
+++ b/base/scoped_handle.h
@@ -11,8 +11,6 @@
 
 #if defined(OS_WIN)
 #include "base/scoped_handle_win.h"
-#elif defined(OS_LINUX)
-#include "base/scoped_handle_gtk.h"
 #endif
 
 class ScopedStdioHandle {
diff --git a/base/scoped_handle_gtk.h b/base/scoped_handle_gtk.h
deleted file mode 100644
index 06dd64d..0000000
--- a/base/scoped_handle_gtk.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2009 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.
-
-#ifndef BASE_SCOPED_HANDLE_GTK_H_
-#define BASE_SCOPED_HANDLE_GTK_H_
-
-#include <gdk/gdk.h>
-
-// Wraps a GdkRegion. This class provides the same methods as ScopedGDIObject in
-// scoped_handle_win.
-class ScopedRegion {
- public:
-  ScopedRegion() : region_(NULL) {}
-  explicit ScopedRegion(GdkRegion* region) : region_(region) {}
-
-  ~ScopedRegion() {
-    Close();
-  }
-
-  void Set(GdkRegion* region) {
-    Close();
-
-    region_ = region;
-  }
-
-  GdkRegion* Get() {
-    return region_;
-  }
-
-  GdkRegion* release() {
-    GdkRegion* region = region_;
-    region_ = NULL;
-    return region;
-  }
-
- private:
-  void Close() {
-    if (region_) {
-      gdk_region_destroy(region_);
-      region_ = NULL;
-    }
-  }
-
-  GdkRegion* region_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedRegion);
-};
-
-#endif  // BASE_SCOPED_HANDLE_GTK_H_
diff --git a/base/scoped_handle_win.h b/base/scoped_handle_win.h
index 6375ad9..dbd0627 100644
--- a/base/scoped_handle_win.h
+++ b/base/scoped_handle_win.h
@@ -168,12 +168,6 @@ class ScopedGDIObject {
     return *this;
   }
 
-  T release() {
-    T object = object_;
-    object_ = NULL;
-    return object;
-  }
-
   operator T() { return object_; }
 
  private:
@@ -188,7 +182,7 @@ class ScopedGDIObject {
 
 // Typedefs for some common use cases.
 typedef ScopedGDIObject<HBITMAP> ScopedBitmap;
-typedef ScopedGDIObject<HRGN> ScopedRegion;
+typedef ScopedGDIObject<HRGN> ScopedHRGN;
 typedef ScopedGDIObject<HFONT> ScopedHFONT;