[Views] Update ink drop for omnibox icons

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // Copyright (c) 2012 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/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/rtl.h"
@@ skipping 661 matching lines @@
     return;
 
   security_state::SecurityLevel security_level =
       GetToolbarModel()->GetSecurityLevel(false);
   SkColor icon_color = (security_level == security_state::NONE ||
                         security_level == security_state::HTTP_SHOW_WARNING)
                            ? color_utils::DeriveDefaultIconColor(GetColor(TEXT))
                            : GetSecureTextColor(security_level);
   location_icon_view_->SetImage(gfx::CreateVectorIcon(
       omnibox_view_->GetVectorIcon(), kIconWidth, icon_color));
+  location_icon_view_->SetEnabled(!omnibox_view_->IsEditingOrEmpty());
 }
 
 bool LocationBarView::RefreshContentSettingViews() {
   bool visibility_changed = false;
   for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
        i != content_setting_views_.end(); ++i) {
     const bool was_visible = (*i)->visible();
     (*i)->Update(GetToolbarModel()->input_in_progress() ? nullptr
                                                         : GetWebContents());
     if (was_visible != (*i)->visible())
@@ skipping 220 matching lines @@
 
 bool LocationBarView::GetBookmarkStarVisibility() {
   DCHECK(star_view_);
   return star_view_->visible();
 }
 
 bool LocationBarView::TestContentSettingImagePressed(size_t index) {
   if (index >= content_setting_views_.size())
     return false;
 
-  // This up-cast is necessary since the descendant class moved OnKeyPressed
-  // to the protected section.
   views::View* image_view = content_setting_views_[index];
+  image_view->SetSize(gfx::Size(24, 24));
+  image_view->OnKeyPressed(
+      ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_SPACE, ui::EF_NONE));
   image_view->OnKeyReleased(
       ui::KeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_SPACE, ui::EF_NONE));
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private views::View implementation:
 
 const char* LocationBarView::GetClassName() const {
   return kViewClassName;
@@ skipping 106 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = nullptr;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }