diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 04:18:24 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 04:18:24 +0000 |
| commit | 9b17389d8b282fdec7763094e12ee6c1eb43cdee (patch) | |
| tree | 74644f477052ecdfc7508bae456c7b4b88532c53 /chrome/browser/ui/views/keyboard_overlay_delegate.cc | |
| parent | 184dd43e2ec49b981b9274247366b020d8210347 (diff) | |
| download | chromium_src-9b17389d8b282fdec7763094e12ee6c1eb43cdee.zip chromium_src-9b17389d8b282fdec7763094e12ee6c1eb43cdee.tar.gz chromium_src-9b17389d8b282fdec7763094e12ee6c1eb43cdee.tar.bz2 | |
Make most shotcut keys take effect on the keyboard overlay.
This patch makes shortcut keys handled by chrome's accelerator handler take
effect on the keyboard overlay.
In order to do keyboard overlay specific accelerator handling, I introduced
a KeyboardOverlayDialogView class which inherit from HtmlDialogView.
BUG=chromium-os:13016
TEST=manually on chrome notebook
Review URL: http://codereview.chromium.org/6854019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81699 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, 0 insertions, 23 deletions
diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.cc b/chrome/browser/ui/views/keyboard_overlay_delegate.cc index e12c75e..8d0f4ad 100644 --- a/chrome/browser/ui/views/keyboard_overlay_delegate.cc +++ b/chrome/browser/ui/views/keyboard_overlay_delegate.cc @@ -8,9 +8,6 @@ #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" @@ -23,26 +20,6 @@ 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), |