diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 04:32:35 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 04:32:35 +0000 |
| commit | 5a7a583e86a3503c00a8e07e0b5f315c6a11a03f (patch) | |
| tree | a61037a234db92147b0614fe7cdddd64b090805b /chrome/browser/ui/views/keyboard_overlay_delegate.cc | |
| parent | 9b17389d8b282fdec7763094e12ee6c1eb43cdee (diff) | |
| download | chromium_src-5a7a583e86a3503c00a8e07e0b5f315c6a11a03f.zip chromium_src-5a7a583e86a3503c00a8e07e0b5f315c6a11a03f.tar.gz chromium_src-5a7a583e86a3503c00a8e07e0b5f315c6a11a03f.tar.bz2 | |
Revert "Make most shotcut keys take effect on the keyboard overlay."
This reverts commit 9a675193fe08ff3dcdf089ace0e61d21dd14856b.
TBR=tfarina@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/keyboard_overlay_delegate.cc')
| -rw-r--r-- | chrome/browser/ui/views/keyboard_overlay_delegate.cc | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.cc b/chrome/browser/ui/views/keyboard_overlay_delegate.cc index 8d0f4ad..e12c75e 100644 --- a/chrome/browser/ui/views/keyboard_overlay_delegate.cc +++ b/chrome/browser/ui/views/keyboard_overlay_delegate.cc @@ -8,6 +8,9 @@ #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/chromeos/frame/bubble_window.h" +#include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/views/html_dialog_view.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/url_constants.h" @@ -20,6 +23,26 @@ static const int kBaseWidth = 1252; static const int kBaseHeight = 516; static const int kHorizontalMargin = 28; +void KeyboardOverlayDelegate::ShowDialog(gfx::NativeWindow owning_window) { + Browser* browser = BrowserList::GetLastActive(); + KeyboardOverlayDelegate* delegate = new KeyboardOverlayDelegate( + UTF16ToWide(l10n_util::GetStringUTF16(IDS_KEYBOARD_OVERLAY_TITLE))); + HtmlDialogView* html_view = + new HtmlDialogView(browser->profile(), delegate); + delegate->set_view(html_view); + html_view->InitDialog(); + html_view->AddAccelerator( + views::Accelerator(ui::VKEY_OEM_2, false, true, true)); + html_view->AddAccelerator( + views::Accelerator(ui::VKEY_OEM_2, true, true, true)); + + chromeos::BubbleWindow::Create(owning_window, + gfx::Rect(), + chromeos::BubbleWindow::STYLE_XSHAPE, + html_view); + html_view->window()->Show(); +} + KeyboardOverlayDelegate::KeyboardOverlayDelegate( const std::wstring& title) : title_(title), |