Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

chrome/browser/views/url_picker.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/url_picker.h"
 
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model.h"
+#include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/possible_url_model.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "grit/app_resources.h"
@@ skipping 85 matching lines @@
       description_label->font().DeriveFont(0, gfx::Font::BOLD));
   layout->AddView(description_label);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(1, single_column_view_set_id);
   layout->AddView(url_table_);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
-  AddAccelerator(views::Accelerator(app::VKEY_RETURN, false, false, false));
+  AddAccelerator(views::Accelerator(base::VKEY_RETURN, false, false, false));
 }
 
 UrlPicker::~UrlPicker() {
   url_table_->SetModel(NULL);
 }
 
 void UrlPicker::Show(HWND parent) {
   DCHECK(!window());
   views::Window::CreateChromeWindow(parent, gfx::Rect(), this)->Show();
   url_field_->SelectAll();
@@ skipping 113 matching lines @@
     PerformModelChange();
     if (window())
       window()->Close();
   }
 }
 
 GURL UrlPicker::GetInputURL() const {
   return URLFixerUpper::FixupURL(UTF16ToUTF8(url_field_->text()),
                                  std::string());
 }