diff options
| author | kaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 10:46:36 +0000 |
|---|---|---|
| committer | kaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 10:46:36 +0000 |
| commit | 3528b7d649dd8efa672dac02a5c9fde3190cbeb1 (patch) | |
| tree | 859fe04d8201bd7297714a701f563a0e5e94481a /ash/shell | |
| parent | 2b6fe01fb5686449a4b1dff5a80cde6667df6f2c (diff) | |
| download | chromium_src-3528b7d649dd8efa672dac02a5c9fde3190cbeb1.zip chromium_src-3528b7d649dd8efa672dac02a5c9fde3190cbeb1.tar.gz chromium_src-3528b7d649dd8efa672dac02a5c9fde3190cbeb1.tar.bz2 | |
Respect user-selected launch type (tab/window/fullscreen) when opening File Manager via Ctrl+M
Also made Ctrl+M work when there are no browser windows.
BUG=chromium-os:27884
TEST=On the Apps screen select "Open as window", press Ctrl+M, File Manager should open in a new window. Same with tab/pinned tab/fullscreen.
Review URL: http://codereview.chromium.org/10091041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/shell_delegate_impl.cc | 3 | ||||
| -rw-r--r-- | ash/shell/shell_delegate_impl.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 78e3325..334e597 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -49,6 +49,9 @@ bool ShellDelegateImpl::IsScreenLocked() const { return locked_; } +void ShellDelegateImpl::OpenFileManager() { +} + void ShellDelegateImpl::Exit() { MessageLoopForUI::current()->Quit(); } diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h index 9c0e403..b0709f6 100644 --- a/ash/shell/shell_delegate_impl.h +++ b/ash/shell/shell_delegate_impl.h @@ -26,6 +26,7 @@ class ShellDelegateImpl : public ash::ShellDelegate { virtual void LockScreen() OVERRIDE; virtual void UnlockScreen() OVERRIDE; virtual bool IsScreenLocked() const OVERRIDE; + virtual void OpenFileManager() OVERRIDE; virtual void Exit() OVERRIDE; virtual void NewWindow(bool incognito) OVERRIDE; virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; |