Move views::Accelerator to ui in order to use it from aura code.

ui/views/window/dialog_client_view.cc

 // Copyright (c) 2011 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"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 59 matching lines @@
                ui::DialogButton type,
                const string16& title,
                bool is_default)
       : NativeTextButton(listener, title),
         owner_(owner),
         type_(type) {
     SetIsDefault(is_default);
   }
 
   // Overridden to forward to the delegate.
-  virtual bool AcceleratorPressed(const Accelerator& accelerator) {
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) {
     if (!owner_->widget_delegate()->AsDialogDelegate()->
         AreAcceleratorsEnabled(type_)) {
       return false;
     }
     return NativeTextButton::AcceleratorPressed(accelerator);
   }
 
  private:
   Widget* owner_;
   const ui::DialogButton type_;
@@ skipping 44 matching lines @@
         (dd->GetDefaultDialogButton() & ui::DIALOG_BUTTON_OK) != 0;
     ok_button_ = new DialogButton(this,
                                   GetWidget(),
                                   ui::DIALOG_BUTTON_OK,
                                   label,
                                   is_default_button);
     ok_button_->SetGroup(kButtonGroup);
     if (is_default_button)
       default_button_ = ok_button_;
     if (!(buttons & ui::DIALOG_BUTTON_CANCEL))
-      ok_button_->AddAccelerator(Accelerator(ui::VKEY_ESCAPE,
-                                             false, false, false));
+      ok_button_->AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE,
+                                                 false, false, false));
     AddChildView(ok_button_);
   }
   if (buttons & ui::DIALOG_BUTTON_CANCEL && !cancel_button_) {
     string16 label =
         dd->GetDialogButtonLabel(ui::DIALOG_BUTTON_CANCEL);
     if (label.empty()) {
       if (buttons & ui::DIALOG_BUTTON_OK) {
         label = l10n_util::GetStringUTF16(IDS_APP_CANCEL);
       } else {
         label = l10n_util::GetStringUTF16(IDS_APP_CLOSE);
       }
     }
     bool is_default_button =
         (dd->GetDefaultDialogButton() & ui::DIALOG_BUTTON_CANCEL)
         != 0;
     cancel_button_ = new DialogButton(this,
                                       GetWidget(),
                                       ui::DIALOG_BUTTON_CANCEL,
                                       label,
                                       is_default_button);
     cancel_button_->SetGroup(kButtonGroup);
-    cancel_button_->AddAccelerator(Accelerator(ui::VKEY_ESCAPE,
-                                               false, false, false));
+    cancel_button_->AddAccelerator(ui::Accelerator(ui::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(ui::VKEY_ESCAPE, false, false, false));
+    AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, false, false, false));
   }
 }
 
 void DialogClientView::SetDefaultButton(NativeTextButton* new_default_button) {
   if (default_button_ && default_button_ != new_default_button) {
     default_button_->SetIsDefault(false);
     default_button_ = NULL;
   }
 
   if (new_default_button) {
@@ skipping 211 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) {
+bool DialogClientView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   // We only expect Escape key.
   DCHECK(accelerator.key_code() == ui::VKEY_ESCAPE);
   Close();
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, ButtonListener implementation:
 
 void DialogClientView::ButtonPressed(
@@ skipping 162 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