From 3528b7d649dd8efa672dac02a5c9fde3190cbeb1 Mon Sep 17 00:00:00 2001 From: "kaznacheev@chromium.org" Date: Wed, 18 Apr 2012 10:46:36 +0000 Subject: 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 --- ash/shell/shell_delegate_impl.cc | 3 +++ ash/shell/shell_delegate_impl.h | 1 + 2 files changed, 4 insertions(+) (limited to 'ash/shell') 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; -- cgit v1.1