diff options
| author | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 00:46:09 +0000 |
|---|---|---|
| committer | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 00:46:09 +0000 |
| commit | 72a98fe4dfd555a5125e9774fc34aaa16a11dbc9 (patch) | |
| tree | 74452d878b60c4b8c6a01105e7489eba2653d7c2 /ash/shell | |
| parent | 2bcb853b7272a030f0b6d9c5088f34c6802858b4 (diff) | |
| download | chromium_src-72a98fe4dfd555a5125e9774fc34aaa16a11dbc9.zip chromium_src-72a98fe4dfd555a5125e9774fc34aaa16a11dbc9.tar.gz chromium_src-72a98fe4dfd555a5125e9774fc34aaa16a11dbc9.tar.bz2 | |
Remove Ash accelerator OPEN_FILE_DIALOG; let Chrome handle it as IDC_OPEN_FILE.
The Ctrl-O had once been handled as global shortcut, but now it is
no-op when no browser is open. It can be moved back to browser
shortcut, as it is handled in all other platforms than Chrome OS.
BUG=301445, 251492
Review URL: https://codereview.chromium.org/25225002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/shell_delegate_impl.cc | 2 | ||||
| -rw-r--r-- | ash/shell/shell_delegate_impl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index fd95202..4a4dbd9 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -87,7 +87,7 @@ void ShellDelegateImpl::ToggleMaximized() { window_state->ToggleMaximized(); } -void ShellDelegateImpl::OpenFileManager(bool as_dialog) { +void ShellDelegateImpl::OpenFileManager() { } void ShellDelegateImpl::OpenCrosh() { diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h index 7a4e5d6..4c215b2 100644 --- a/ash/shell/shell_delegate_impl.h +++ b/ash/shell/shell_delegate_impl.h @@ -37,7 +37,7 @@ class ShellDelegateImpl : public ash::ShellDelegate { virtual void NewWindow(bool incognito) OVERRIDE; virtual void ToggleFullscreen() OVERRIDE; virtual void ToggleMaximized() OVERRIDE; - virtual void OpenFileManager(bool as_dialog) OVERRIDE; + virtual void OpenFileManager() OVERRIDE; virtual void OpenCrosh() OVERRIDE; virtual void RestoreTab() OVERRIDE; virtual void ShowKeyboardOverlay() OVERRIDE; |