Remove uses of std::unary_function and std::binary_function.

This patch removes unary and binary function, since those are deprecated
in C++11. They also only provide two typedefs, so this cleans up some
code. In rare cases where the typedefs are actually required, it's
easier to just provide the typedef directly instead of deriving from
one of these functions.

BUG=593407

Review URL: https://codereview.chromium.org/1420333006

Cr-Commit-Position: refs/heads/master@{#380179}

2 files changed, 4 insertions, 8 deletions

diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc
index 2036d55..e415726 100644
--- a/ash/wm/overview/window_grid.cc
+++ b/ash/wm/overview/window_grid.cc
@@ -68,8 +68,7 @@ void CleanupWidgetAfterAnimationObserver::OnImplicitAnimationsCompleted() {
 }
 
 // A comparator for locating a given target window.
-struct WindowSelectorItemComparator
-    : public std::unary_function<WindowSelectorItem*, bool> {
+struct WindowSelectorItemComparator {
   explicit WindowSelectorItemComparator(const aura::Window* target_window)
       : target(target_window) {
   }
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc
index c940dff..109143e 100644
--- a/ash/wm/overview/window_selector.cc
+++ b/ash/wm/overview/window_selector.cc
@@ -73,8 +73,7 @@ const unsigned char kTextFilterOpacity = 180;
 const int kTextFilterCornerRadius = 1;
 
 // A comparator for locating a grid with a given root window.
-struct RootWindowGridComparator
-    : public std::unary_function<WindowGrid*, bool> {
+struct RootWindowGridComparator {
   explicit RootWindowGridComparator(const aura::Window* root_window)
       : root_window_(root_window) {
   }
@@ -87,8 +86,7 @@ struct RootWindowGridComparator
 };
 
 // A comparator for locating a selectable window given a targeted window.
-struct WindowSelectorItemTargetComparator
-    : public std::unary_function<WindowSelectorItem*, bool> {
+struct WindowSelectorItemTargetComparator {
   explicit WindowSelectorItemTargetComparator(const aura::Window* target_window)
       : target(target_window) {
   }
@@ -101,8 +99,7 @@ struct WindowSelectorItemTargetComparator
 };
 
 // A comparator for locating a selector item for a given root.
-struct WindowSelectorItemForRoot
-    : public std::unary_function<WindowSelectorItem*, bool> {
+struct WindowSelectorItemForRoot {
   explicit WindowSelectorItemForRoot(const aura::Window* root)
       : root_window(root) {
   }