Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Side by Side Diff: chrome/browser/ui/views/keyboard_overlay_dialog_view.cc

Issue 8341050: Aura: Support non-global keyboard shortcuts. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Restore native_widget_aura change Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/frame/bubble_window.h" 8 #include "chrome/browser/chromeos/frame/bubble_window.h"
9 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 9 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
10 #include "chrome/browser/ui/browser_dialogs.h" 10 #include "chrome/browser/ui/browser_dialogs.h"
11 #include "chrome/browser/ui/views/accelerator_table_linux.h" 11 #include "chrome/browser/ui/views/accelerator_table.h"
12 #include "chrome/browser/ui/views/frame/browser_view.h" 12 #include "chrome/browser/ui/views/frame/browser_view.h"
13 #include "chrome/browser/ui/views/keyboard_overlay_delegate.h" 13 #include "chrome/browser/ui/views/keyboard_overlay_delegate.h"
14 #include "chrome/browser/ui/views/window.h" 14 #include "chrome/browser/ui/views/window.h"
15 #include "content/browser/tab_contents/tab_contents.h" 15 #include "content/browser/tab_contents/tab_contents.h"
16 #include "content/public/browser/native_web_keyboard_event.h" 16 #include "content/public/browser/native_web_keyboard_event.h"
17 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
18 #include "ui/base/keycodes/keyboard_codes.h" 18 #include "ui/base/keycodes/keyboard_codes.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 #include "views/events/event.h" 20 #include "views/events/event.h"
21 #include "views/widget/root_view.h" 21 #include "views/widget/root_view.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 chromeos::BubbleWindow::Create(owning_window, 97 chromeos::BubbleWindow::Create(owning_window,
98 chromeos::STYLE_FLUSH, 98 chromeos::STYLE_FLUSH,
99 html_view); 99 html_view);
100 html_view->GetWidget()->Show(); 100 html_view->GetWidget()->Show();
101 } 101 }
102 102
103 bool KeyboardOverlayDialogView::IsCloseAccelerator( 103 bool KeyboardOverlayDialogView::IsCloseAccelerator(
104 const views::Accelerator& accelerator) { 104 const views::Accelerator& accelerator) {
105 return close_accelerators_.find(accelerator) != close_accelerators_.end(); 105 return close_accelerators_.find(accelerator) != close_accelerators_.end();
106 } 106 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698