diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 21:32:30 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 21:32:30 +0000 |
| commit | a4d271ecbea5ed763d49919fac7bfabe788832f6 (patch) | |
| tree | c646a4d085142007968138c7ad26d1fb2aafe6a9 /chrome/browser/views/frame | |
| parent | 19ff283d0e043c59206fdc2e890a2780933849fe (diff) | |
| download | chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.zip chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.tar.gz chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.tar.bz2 | |
Reverting 27412 it breaks the toolkit views Linux build.
TBR=sky
Review URL: http://codereview.chromium.org/254005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 50fd3bd..d4a0e8f 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -10,7 +10,6 @@ #include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "base/command_line.h" -#include "base/keyboard_codes.h" #include "base/time.h" #include "build/build_config.h" #include "chrome/app/chrome_dll_resource.h" @@ -586,13 +585,13 @@ bool BrowserView::GetAccelerator(int cmd_id, views::Accelerator* accelerator) { // anywhere so we need to check for them explicitly here. switch (cmd_id) { case IDC_CUT: - *accelerator = views::Accelerator(base::VKEY_X, false, true, false); + *accelerator = views::Accelerator(L'X', false, true, false); return true; case IDC_COPY: - *accelerator = views::Accelerator(base::VKEY_C, false, true, false); + *accelerator = views::Accelerator(L'C', false, true, false); return true; case IDC_PASTE: - *accelerator = views::Accelerator(base::VKEY_V, false, true, false); + *accelerator = views::Accelerator(L'V', false, true, false); return true; } // Else, we retrieve the accelerator information from the accelerator table. @@ -1994,9 +1993,8 @@ void BrowserView::LoadAccelerators() { bool alt_down = (accelerators[i].fVirt & FALT) == FALT; bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL; bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT; - views::Accelerator accelerator( - static_cast<base::KeyboardCode>(accelerators[i].key), - shift_down, ctrl_down, alt_down); + views::Accelerator accelerator(accelerators[i].key, shift_down, ctrl_down, + alt_down); accelerator_table_[accelerator] = accelerators[i].cmd; // Also register with the focus manager. |