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/ui/views/keyboard_overlay_delegate.h" | 8 #include "chrome/browser/ui/views/keyboard_overlay_delegate.h" |
9 #include "content/public/browser/browser_context.h" | 9 #include "content/public/browser/browser_context.h" |
10 #include "grit/generated_resources.h" | 10 #include "grit/generated_resources.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 | 21 |
22 namespace { | 22 namespace { |
23 // Store the pointer to the view currently shown. | 23 // Store the pointer to the view currently shown. |
24 KeyboardOverlayDialogView* g_instance = NULL; | 24 KeyboardOverlayDialogView* g_instance = NULL; |
25 } | 25 } |
26 | 26 |
27 KeyboardOverlayDialogView::KeyboardOverlayDialogView( | 27 KeyboardOverlayDialogView::KeyboardOverlayDialogView( |
28 content::BrowserContext* context, | 28 content::BrowserContext* context, |
29 WebDialogDelegate* delegate, | 29 WebDialogDelegate* delegate, |
30 WebContentsHandler* handler) | 30 WebContentsHandler* handler) |
31 : WebDialogView(context, delegate, handler) { | 31 : views::WebDialogView(context, delegate, handler) { |
32 } | 32 } |
33 | 33 |
34 KeyboardOverlayDialogView::~KeyboardOverlayDialogView() { | 34 KeyboardOverlayDialogView::~KeyboardOverlayDialogView() { |
35 } | 35 } |
36 | 36 |
37 void KeyboardOverlayDialogView::ShowDialog( | 37 void KeyboardOverlayDialogView::ShowDialog( |
38 content::BrowserContext* context, | 38 content::BrowserContext* context, |
39 WebContentsHandler* handler) { | 39 WebContentsHandler* handler) { |
40 // Ignore the call if another view is already shown. | 40 // Ignore the call if another view is already shown. |
41 if (g_instance) | 41 if (g_instance) |
(...skipping 14 matching lines...) Expand all Loading... |
56 g_instance = view; | 56 g_instance = view; |
57 } | 57 } |
58 | 58 |
59 void KeyboardOverlayDialogView::WindowClosing() { | 59 void KeyboardOverlayDialogView::WindowClosing() { |
60 #if defined(OS_CHROMEOS) | 60 #if defined(OS_CHROMEOS) |
61 // Re-enable the IME accelerators. See the comment in ShowDialog() above. | 61 // Re-enable the IME accelerators. See the comment in ShowDialog() above. |
62 chromeos::input_method::InputMethodManager::GetInstance()->EnableHotkeys(); | 62 chromeos::input_method::InputMethodManager::GetInstance()->EnableHotkeys(); |
63 #endif | 63 #endif |
64 g_instance = NULL; | 64 g_instance = NULL; |
65 } | 65 } |
OLD | NEW |