Re-lands 58186:

views/controls/link.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 "views/controls/link.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "base/logging.h"
 #include "gfx/color_utils.h"
 #include "gfx/font.h"
 #include "views/event.h"
 
 namespace {
 
 void GetColors(const SkColor* background_color,  // NULL means "use default"
                SkColor* highlighted_color,
                SkColor* disabled_color,
@@ skipping 93 matching lines @@
       HitTest(e.location())) {
     // Focus the link on click.
     RequestFocus();
 
     if (controller_)
       controller_->LinkActivated(this, e.GetFlags());
   }
 }
 
 bool Link::OnKeyPressed(const KeyEvent& e) {
-  bool activate = ((e.GetKeyCode() == base::VKEY_SPACE) ||
-                   (e.GetKeyCode() == base::VKEY_RETURN));
+  bool activate = ((e.GetKeyCode() == app::VKEY_SPACE) ||
+                   (e.GetKeyCode() == app::VKEY_RETURN));
   if (!activate)
     return false;
 
   SetHighlighted(false);
 
   // Focus the link on key pressed.
   RequestFocus();
 
   if (controller_)
     controller_->LinkActivated(this, e.GetFlags());
 
   return true;
 }
 
 bool Link::SkipDefaultKeyEventProcessing(const KeyEvent& e) {
   // Make sure we don't process space or enter as accelerators.
-  return (e.GetKeyCode() == base::VKEY_SPACE) ||
-      (e.GetKeyCode() == base::VKEY_RETURN);
+  return (e.GetKeyCode() == app::VKEY_SPACE) ||
+      (e.GetKeyCode() == app::VKEY_RETURN);
 }
 
 bool Link::GetAccessibleRole(AccessibilityTypes::Role* role) {
   DCHECK(role);
 
   *role = AccessibilityTypes::ROLE_LINK;
   return true;
 }
 
 void Link::SetFont(const gfx::Font& font) {
@@ skipping 64 matching lines @@
   } else {
     if (font().GetStyle() & gfx::Font::UNDERLINED) {
       Label::SetFont(
           font().DeriveFont(0, font().GetStyle() & ~gfx::Font::UNDERLINED));
     }
     Label::SetColor(disabled_color_);
   }
 }
 
 }  // namespace views