diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 11:32:20 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 11:32:20 +0000 |
| commit | c4e14acfa731f1a51c0a0053cd48707de45369ea (patch) | |
| tree | 02f271e6d330f70d9908ab039adae8cea5a74ca6 /content/shell/shell_win.cc | |
| parent | b93a3636364ac026697cf08a8b213fd76882363b (diff) | |
| download | chromium_src-c4e14acfa731f1a51c0a0053cd48707de45369ea.zip chromium_src-c4e14acfa731f1a51c0a0053cd48707de45369ea.tar.gz chromium_src-c4e14acfa731f1a51c0a0053cd48707de45369ea.tar.bz2 | |
Revert r136851 - "Add keyboard shortcut to create windows (content_shell)"
It fails to compile on Win Aura:
http://build.chromium.org/p/chromium/builders/Win%20Aura/builds/12563
BUG=None
TEST=None
TBR=cem.kocagil@gmail.com, jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10389115
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_win.cc')
| -rw-r--r--[-rwxr-xr-x] | content/shell/shell_win.cc | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/content/shell/shell_win.cc b/content/shell/shell_win.cc index ff3519a..3aeef3c 100755..100644 --- a/content/shell/shell_win.cc +++ b/content/shell/shell_win.cc @@ -11,7 +11,6 @@ #include "base/utf_string_conversions.h" #include "base/win/resource_util.h" #include "base/win/wrapped_window_proc.h" -#include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/shell/resource.h" @@ -189,30 +188,6 @@ void Shell::Close() { DestroyWindow(window_); } -bool Shell::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, - bool* is_keyboard_shortcut) { - if (event.type != WebKit::WebInputEvent::RawKeyDown) - return false; - - bool control = (event.modifiers & NativeWebKeyboardEvent::ControlKey) == - NativeWebKeyboardEvent::ControlKey; - bool shift = (event.modifiers & NativeWebKeyboardEvent::ShiftKey) == - NativeWebKeyboardEvent::ShiftKey; - bool alt = (event.modifiers & NativeWebKeyboardEvent::AltKey) == - NativeWebKeyboardEvent::AltKey; - - // Control-N creates a new window - if (control && !shift && !alt && - event.text[0] == 'N') { - CreateNewWindow(web_contents()->GetBrowserContext(), GURL(), NULL, - MSG_ROUTING_NONE, NULL); - return true; - } - - *is_keyboard_shortcut = true; - return false; -} - ATOM Shell::RegisterWindowClass() { WNDCLASSEX window_class; base::win::InitializeWindowClass( |