[MD settings] do not scroll when toggling advanced menu

ash/shelf/app_list_button.cc

 // Copyright 2014 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 "ash/shelf/app_list_button.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_item_types.h"
@@ skipping 249 matching lines @@
   return base::WrapUnique(ink_drop_ripple);
 }
 
 void AppListButton::NotifyClick(const ui::Event& event) {
   ImageButton::NotifyClick(event);
   if (listener_)
     listener_->ButtonPressed(this, event, ink_drop());
 }
 
 bool AppListButton::ShouldEnterPushedState(const ui::Event& event) {
-  return !Shell::GetInstance()->IsApplistVisible();
+  if (!shelf_view_->ShouldEventActivateButton(this, event))
+    return false;
+  if (Shell::GetInstance()->IsApplistVisible())
+    return false;
+  return views::ImageButton::ShouldEnterPushedState(event);

[Dan Beam, 2016/07/08 23:32:28]

wat

[dschuyler, 2016/07/20 19:03:01]

Done.

 }
 
 bool AppListButton::ShouldShowInkDropHighlight() const {
   return false;
 }
 
 void AppListButton::SetDrawBackgroundAsActive(bool draw_background_as_active) {
   if (draw_background_as_active_ == draw_background_as_active)
     return;
   draw_background_as_active_ = draw_background_as_active;
   SchedulePaint();
 }
 
 }  // namespace ash