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

chrome/browser/views/info_bubble.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/info_bubble.h"
 
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/color_utils.h"
 #include "gfx/path.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "views/fill_layout.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/client_view.h"
@@ skipping 401 matching lines @@
 
   // |contents_view| has no layout manager, so we have to explicitly position
   // its children.
   border_contents_->SetBounds(gfx::Rect(gfx::Point(), window_bounds.size()));
   contents->SetBounds(contents_bounds);
 #endif
   SetBounds(window_bounds);
 
   // Register the Escape accelerator for closing.
   GetFocusManager()->RegisterAccelerator(
-      views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
+      views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
 
   // Done creating the bubble.
   NotificationService::current()->Notify(NotificationType::INFO_BUBBLE_CREATED,
                                          Source<InfoBubble>(this),
                                          NotificationService::NoDetails());
 
   // Show the window.
 #if defined(OS_WIN)
   border_->ShowWindow(SW_SHOW);
   ShowWindow(SW_SHOW);
@@ skipping 44 matching lines @@
   if (!IsActive())
     Close();
 }
 #endif
 
 void InfoBubble::DoClose(bool closed_by_escape) {
   if (show_status_ == kClosed)
     return;
 
   GetFocusManager()->UnregisterAccelerator(
-      views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
+      views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
   if (delegate_)
     delegate_->InfoBubbleClosing(this, closed_by_escape);
   show_status_ = kClosed;
 #if defined(OS_WIN)
   border_->Close();
   WidgetWin::Close();
 #elif defined(OS_LINUX)
   WidgetGtk::Close();
 #endif
 }
@@ skipping 28 matching lines @@
     animation_->Hide();
 }
 
 bool InfoBubble::AcceleratorPressed(const views::Accelerator& accelerator) {
   if (!delegate_ || delegate_->CloseOnEscape()) {
     DoClose(true);
     return true;
   }
   return false;
 }