Re-lands 58186:

chrome/browser/views/dropdown_bar_host.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/dropdown_bar_host.h"
 
+#include "app/keyboard_codes.h"
 #include "app/slide_animation.h"
-#include "base/keyboard_codes.h"
 #include "base/scoped_handle.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/dropdown_bar_view.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "gfx/path.h"
 #include "gfx/scrollbar_size.h"
@@ skipping 271 matching lines @@
     ScopedRegion exclude_region(exclude_path.CreateNativeRegion());
     region.Set(Path::SubtractRegion(region.Get(), exclude_region.Get()));
   }
 
   // Window takes ownership of the region.
   host()->SetShape(region.release());
 }
 
 void DropdownBarHost::RegisterAccelerators() {
   DCHECK(!esc_accel_target_registered_);
-  views::Accelerator escape(base::VKEY_ESCAPE, false, false, false);
+  views::Accelerator escape(app::VKEY_ESCAPE, false, false, false);
   focus_manager_->RegisterAccelerator(escape, this);
   esc_accel_target_registered_ = true;
 }
 
 void DropdownBarHost::UnregisterAccelerators() {
   DCHECK(esc_accel_target_registered_);
-  views::Accelerator escape(base::VKEY_ESCAPE, false, false, false);
+  views::Accelerator escape(app::VKEY_ESCAPE, false, false, false);
   focus_manager_->UnregisterAccelerator(escape, this);
   esc_accel_target_registered_ = false;
 }