OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" | 5 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 8 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
9 #include "chrome/browser/ui/browser_dialogs.h" | 9 #include "chrome/browser/ui/browser_dialogs.h" |
10 #include "chrome/browser/ui/views/accelerator_table.h" | 10 #include "chrome/browser/ui/views/accelerator_table.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 {ui::VKEY_ESCAPE, true, false, false}, | 32 {ui::VKEY_ESCAPE, true, false, false}, |
33 }; | 33 }; |
34 } // namespace | 34 } // namespace |
35 | 35 |
36 KeyboardOverlayDialogView::KeyboardOverlayDialogView( | 36 KeyboardOverlayDialogView::KeyboardOverlayDialogView( |
37 Profile* profile, | 37 Profile* profile, |
38 HtmlDialogUIDelegate* delegate, | 38 HtmlDialogUIDelegate* delegate, |
39 BrowserView* parent_view) | 39 BrowserView* parent_view) |
40 : HtmlDialogView(profile, parent_view->browser(), delegate), | 40 : HtmlDialogView(profile, parent_view->browser(), delegate), |
41 parent_view_(parent_view) { | 41 parent_view_(parent_view) { |
| 42 RegisterDialogAccelerators(); |
42 } | 43 } |
43 | 44 |
44 KeyboardOverlayDialogView::~KeyboardOverlayDialogView() { | 45 KeyboardOverlayDialogView::~KeyboardOverlayDialogView() { |
45 } | 46 } |
46 | 47 |
47 void KeyboardOverlayDialogView::RegisterDialogAccelerators() { | 48 void KeyboardOverlayDialogView::RegisterDialogAccelerators() { |
48 for (size_t i = 0; i < arraysize(kCloseAccelerators); ++i) { | 49 for (size_t i = 0; i < arraysize(kCloseAccelerators); ++i) { |
49 ui::Accelerator accelerator(kCloseAccelerators[i].keycode, | 50 ui::Accelerator accelerator(kCloseAccelerators[i].keycode, |
50 kCloseAccelerators[i].shift_pressed, | 51 kCloseAccelerators[i].shift_pressed, |
51 kCloseAccelerators[i].ctrl_pressed, | 52 kCloseAccelerators[i].ctrl_pressed, |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 size.width(), | 104 size.width(), |
104 size.height()); | 105 size.height()); |
105 html_view->GetWidget()->SetBounds(bounds); | 106 html_view->GetWidget()->SetBounds(bounds); |
106 html_view->GetWidget()->Show(); | 107 html_view->GetWidget()->Show(); |
107 } | 108 } |
108 | 109 |
109 bool KeyboardOverlayDialogView::IsCloseAccelerator( | 110 bool KeyboardOverlayDialogView::IsCloseAccelerator( |
110 const ui::Accelerator& accelerator) { | 111 const ui::Accelerator& accelerator) { |
111 return close_accelerators_.find(accelerator) != close_accelerators_.end(); | 112 return close_accelerators_.find(accelerator) != close_accelerators_.end(); |
112 } | 113 } |
OLD | NEW |