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

views/window/dialog_client_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 "views/window/dialog_client_view.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #else
 #include <gtk/gtk.h>
 #endif
 
 #include <algorithm>
 
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/keyboard_codes.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "grit/app_strings.h"
 #include "views/controls/button/native_button.h"
 #include "views/standard_layout.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
 #include "gfx/native_theme_win.h"
@@ skipping 102 matching lines @@
       label = l10n_util::GetString(IDS_APP_OK);
     bool is_default_button =
         (dd->GetDefaultDialogButton() & MessageBoxFlags::DIALOGBUTTON_OK) != 0;
     ok_button_ = new DialogButton(this, window(),
                                   MessageBoxFlags::DIALOGBUTTON_OK, label,
                                   is_default_button);
     ok_button_->SetGroup(kButtonGroup);
     if (is_default_button)
       default_button_ = ok_button_;
     if (!(buttons & MessageBoxFlags::DIALOGBUTTON_CANCEL))
-      ok_button_->AddAccelerator(Accelerator(app::VKEY_ESCAPE,
+      ok_button_->AddAccelerator(Accelerator(base::VKEY_ESCAPE,
                                              false, false, false));
     AddChildView(ok_button_);
   }
   if (buttons & MessageBoxFlags::DIALOGBUTTON_CANCEL && !cancel_button_) {
     std::wstring label =
         dd->GetDialogButtonLabel(MessageBoxFlags::DIALOGBUTTON_CANCEL);
     if (label.empty()) {
       if (buttons & MessageBoxFlags::DIALOGBUTTON_OK) {
         label = l10n_util::GetString(IDS_APP_CANCEL);
       } else {
         label = l10n_util::GetString(IDS_APP_CLOSE);
       }
     }
     bool is_default_button =
         (dd->GetDefaultDialogButton() & MessageBoxFlags::DIALOGBUTTON_CANCEL)
         != 0;
     cancel_button_ = new DialogButton(this, window(),
                                       MessageBoxFlags::DIALOGBUTTON_CANCEL,
                                       label, is_default_button);
     cancel_button_->SetGroup(kButtonGroup);
-    cancel_button_->AddAccelerator(Accelerator(app::VKEY_ESCAPE,
+    cancel_button_->AddAccelerator(Accelerator(base::VKEY_ESCAPE,
                                                false, false, false));
     if (is_default_button)
       default_button_ = ok_button_;
     AddChildView(cancel_button_);
   }
   if (!buttons) {
     // Register the escape key as an accelerator which will close the window
     // if there are no dialog buttons.
-    AddAccelerator(Accelerator(app::VKEY_ESCAPE, false, false, false));
+    AddAccelerator(Accelerator(base::VKEY_ESCAPE, false, false, false));
   }
 }
 
 void DialogClientView::SetDefaultButton(NativeButton* new_default_button) {
   if (default_button_ && default_button_ != new_default_button) {
     default_button_->SetIsDefault(false);
     default_button_ = NULL;
   }
 
   if (new_default_button) {
@@ skipping 197 matching lines @@
   if (bottom_view_) {
     gfx::Size bottom_pref = bottom_view_->GetPreferredSize();
     prefsize.Enlarge(0, bottom_pref.height() + kButtonVEdgeMargin);
   }
   prefsize.Enlarge(0, button_height);
   return prefsize;
 }
 
 bool DialogClientView::AcceleratorPressed(const Accelerator& accelerator) {
   // We only expect Escape key.
-  DCHECK(accelerator.GetKeyCode() == app::VKEY_ESCAPE);
+  DCHECK(accelerator.GetKeyCode() == base::VKEY_ESCAPE);
   Close();
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, ButtonListener implementation:
 
 void DialogClientView::ButtonPressed(
     Button* sender, const views::Event& event) {
   // We NULL check the delegate here since the buttons can receive WM_COMMAND
@@ skipping 161 matching lines @@
 void DialogClientView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     dialog_button_font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont));
     initialized = true;
   }
 }
 
 }  // namespace views