Use ContainsValue() instead of std::find() in ui/wm and ui/message_center

ui/message_center/views/message_list_view.cc

 // Copyright (c) 2015 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 <algorithm>
-
+#include "ui/message_center/views/message_list_view.h"

[a.suchit2, 2017/06/07 06:30:13]

one empty line required after line 5.

[Tripta, 2017/06/07 06:40:13]

Done.

 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_switches.h"
 #include "ui/message_center/views/message_center_view.h"
-#include "ui/message_center/views/message_list_view.h"
 #include "ui/message_center/views/message_view.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace message_center {
 
 namespace {
 const int kAnimateClearingNextNotificationDelayMS = 40;
@@ skipping 70 matching lines @@
 
   adding_views_.insert(view);
   DoUpdateIfPossible();
 }
 
 void MessageListView::RemoveNotification(MessageView* view) {
   DCHECK_EQ(view->parent(), this);
 
   // TODO(yhananda): We should consider consolidating clearing_all_views_,
   // deleting_views_ and deleted_when_done_.
-  if (std::find(clearing_all_views_.begin(), clearing_all_views_.end(), view) !=
-          clearing_all_views_.end() ||
+  if (base::ContainsValue(clearing_all_views_, view) ||
       deleting_views_.find(view) != deleting_views_.end() ||
       deleted_when_done_.find(view) != deleted_when_done_.end()) {
     // Let's skip deleting the view if it's already scheduled for deleting.
     // Even if we check clearing_all_views_ here, we actualy have no idea
     // whether the view is due to be removed or not because it could be in its
     // animation before removal.
     // In short, we could delete the view twice even if we check these three
     // lists.
     return;
   }
@@ skipping 11 matching lines @@
     } else {
       delete view;
     }
     DoUpdateIfPossible();
   }
 }
 
 void MessageListView::UpdateNotification(MessageView* view,
                                          const Notification& notification) {
   // Skip updating the notification being cleared
-  if (std::find(clearing_all_views_.begin(), clearing_all_views_.end(), view) !=
-      clearing_all_views_.end())
+  if (base::ContainsValue(clearing_all_views_, view))
     return;
 
   int index = GetIndexOf(view);
   DCHECK_LE(0, index);  // GetIndexOf is negative if not a child.
 
   animator_.StopAnimatingView(view);
   if (deleting_views_.find(view) != deleting_views_.end())
     deleting_views_.erase(view);
   if (deleted_when_done_.find(view) != deleted_when_done_.end())
     deleted_when_done_.erase(view);
@@ skipping 185 matching lines @@
   if (quit_message_loop_after_animation_for_test_)
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
 bool MessageListView::IsValidChild(const views::View* child) const {
   return child->visible() &&
          deleting_views_.find(const_cast<views::View*>(child)) ==
              deleting_views_.end() &&
          deleted_when_done_.find(const_cast<views::View*>(child)) ==
              deleted_when_done_.end() &&
-         std::find(clearing_all_views_.begin(), clearing_all_views_.end(),
-                   child) == clearing_all_views_.end();
+         !base::ContainsValue(clearing_all_views_, child);
 }
 
 void MessageListView::DoUpdateIfPossible() {
   gfx::Rect child_area = GetContentsBounds();
   if (child_area.IsEmpty())
     return;
 
   if (animator_.IsAnimating()) {
     has_deferred_task_ = true;
     return;
@@ skipping 227 matching lines @@
         base::TimeDelta::FromMilliseconds(
             kAnimateClearingNextNotificationDelayMS));
   }
 }
 
 void MessageListView::SetRepositionTargetForTest(const gfx::Rect& target_rect) {
   SetRepositionTarget(target_rect);
 }
 
 }  // namespace message_center