Rename InkDropHover to InkDropHighlight

chrome/browser/ui/views/toolbar/toolbar_action_view.cc

 // Copyright 2013 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/ui/views/toolbar/toolbar_action_view.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 99 matching lines @@
 SkColor ToolbarActionView::GetInkDropBaseColor() const {
   if (delegate_->ShownInsideMenu()) {
     return GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::kColorId_HoverMenuItemBackgroundColor);
   }
 
   return GetThemeProvider()->GetColor(
       ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
 }
 
-bool ToolbarActionView::ShouldShowInkDropHover() const {
+bool ToolbarActionView::ShouldShowInkDropHighlight() const {
   return !delegate_->ShownInsideMenu() &&
-         views::MenuButton::ShouldShowInkDropHover();
+         views::MenuButton::ShouldShowInkDropHighlight();
 }
 
 content::WebContents* ToolbarActionView::GetCurrentWebContents() const {
   return delegate_->GetCurrentWebContents();
 }
 
 void ToolbarActionView::UpdateState() {
   content::WebContents* web_contents = GetCurrentWebContents();
   if (SessionTabHelper::IdForTab(web_contents) < 0)
     return;
@@ skipping 190 matching lines @@
     if (menu_controller->in_nested_run()) {
       // There is another menu showing. Close the outermost menu (since we are
       // shown in the same menu, we don't want to close the whole thing).
       menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST);
       return true;
     }
   }
 
   return false;
 }