Re-lands 58186:

chrome/browser/views/location_bar/page_action_image_view.cc

 // Copyright (c) 2010 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/views/location_bar/page_action_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
@@ skipping 119 matching lines @@
     // Make the menu appear below the button.
     menu_origin.Offset(0, height());
     ShowContextMenu(menu_origin, true);
     return;
   }
 
   ExecuteAction(button, false);  // inspect_with_devtools
 }
 
 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;
   }
   return false;
 }
 
 void PageActionImageView::ShowContextMenu(const gfx::Point& p,
                                           bool is_mouse_gesture) {
   Extension* extension = profile_->GetExtensionsService()->GetExtensionById(
       page_action()->extension_id(), false);
@@ skipping 79 matching lines @@
 void PageActionImageView::ExtensionPopupIsClosing(ExtensionPopup* popup) {
   DCHECK_EQ(popup_, popup);
   // ExtensionPopup is ref-counted, so we don't need to delete it.
   popup_ = NULL;
 }
 
 void PageActionImageView::HidePopup() {
   if (popup_)
     popup_->Close();
 }