Re-lands 58186:

chrome/browser/views/location_bar/location_bar_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/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 925 matching lines @@
   }
 
 #if defined(OS_WIN)
   return location_entry_->SkipDefaultKeyEventProcessing(e);
 #else
   // TODO(jcampan): We need to refactor the code of
   // AutocompleteEditViewWin::SkipDefaultKeyEventProcessing into this class so
   // it can be shared between Windows and Linux.
   // For now, we just override back-space and tab keys, as back-space is the
   // accelerator for back navigation and tab key is used by some input methods.
-  if (e.GetKeyCode() == base::VKEY_BACK ||
+  if (e.GetKeyCode() == app::VKEY_BACK ||
       views::FocusManager::IsTabTraversalKeyEvent(e))
     return true;
   return false;
 #endif
 }
 
 bool LocationBarView::GetAccessibleRole(AccessibilityTypes::Role* role) {
   DCHECK(role);
 
   *role = AccessibilityTypes::ROLE_GROUPING;
@@ skipping 127 matching lines @@
 
   NOTREACHED();
 }
 
 void LocationBarView::OnTemplateURLModelChanged() {
   template_url_model_->RemoveObserver(this);
   template_url_model_ = NULL;
   ShowFirstRunBubble(bubble_type_);
 }