Re-lands 58186:

chrome/browser/views/location_bar/page_action_image_view.cc

Index: chrome/browser/views/location_bar/page_action_image_view.cc
diff --git a/chrome/browser/views/location_bar/page_action_image_view.cc b/chrome/browser/views/location_bar/page_action_image_view.cc
index c2d72e37527e85ddd09097edb90658782d433804..058100c7119e29fbca5f4f90b050fd0c556833ef 100644
--- a/chrome/browser/views/location_bar/page_action_image_view.cc
+++ b/chrome/browser/views/location_bar/page_action_image_view.cc
@@ -137,8 +137,8 @@ void PageActionImageView::OnMouseReleased(const views::MouseEvent& event,
 }
 
 bool PageActionImageView::OnKeyPressed(const views::KeyEvent& e) {
-  if (e.GetKeyCode() == base::VKEY_SPACE ||
-      e.GetKeyCode() == base::VKEY_RETURN) {
+  if (e.GetKeyCode() == app::VKEY_SPACE ||
+      e.GetKeyCode() == app::VKEY_RETURN) {
     ExecuteAction(1, false);
     return true;
   }