| 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 "ash/keyboard_overlay/keyboard_overlay_view.h" | 5 #include "ash/keyboard_overlay/keyboard_overlay_view.h" |
| 6 | 6 |
| 7 #include "ash/keyboard_overlay/keyboard_overlay_delegate.h" | 7 #include "ash/keyboard_overlay/keyboard_overlay_delegate.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "content/public/browser/browser_context.h" | 10 #include "content/public/browser/browser_context.h" |
| 11 #include "grit/ash_strings.h" | 11 #include "grit/ash_strings.h" |
| 12 #include "ui/base/event.h" | 12 #include "ui/base/events/event.h" |
| 13 #include "ui/base/l10n/l10n_util.h" | 13 #include "ui/base/l10n/l10n_util.h" |
| 14 #include "ui/gfx/screen.h" | 14 #include "ui/gfx/screen.h" |
| 15 #include "ui/views/widget/widget.h" | 15 #include "ui/views/widget/widget.h" |
| 16 #include "ui/web_dialogs/web_dialog_delegate.h" | 16 #include "ui/web_dialogs/web_dialog_delegate.h" |
| 17 | 17 |
| 18 using ui::WebDialogDelegate; | 18 using ui::WebDialogDelegate; |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 // Keys to invoke Cancel (Escape, Ctrl+Alt+/, or Shift+Ctrl+Alt+/). | 22 // Keys to invoke Cancel (Escape, Ctrl+Alt+/, or Shift+Ctrl+Alt+/). |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 KeyboardOverlayView* view = | 74 KeyboardOverlayView* view = |
| 75 new KeyboardOverlayView(context, delegate, handler); | 75 new KeyboardOverlayView(context, delegate, handler); |
| 76 delegate->Show(view); | 76 delegate->Show(view); |
| 77 | 77 |
| 78 ash::Shell::GetInstance()->overlay_filter()->Activate(view); | 78 ash::Shell::GetInstance()->overlay_filter()->Activate(view); |
| 79 } | 79 } |
| 80 | 80 |
| 81 void KeyboardOverlayView::WindowClosing() { | 81 void KeyboardOverlayView::WindowClosing() { |
| 82 Cancel(); | 82 Cancel(); |
| 83 } | 83 } |
| OLD | NEW |