summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/ash/chrome_shell_delegate.cc20
-rw-r--r--chrome/browser/ui/ash/chrome_shell_delegate.h2
2 files changed, 8 insertions, 14 deletions
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index e717d1d..050e1ca 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -49,7 +49,6 @@
#include "base/chromeos/chromeos_version.h"
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
#include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
-#include "chrome/browser/chromeos/extensions/file_manager_util.h"
#include "chrome/browser/chromeos/extensions/media_player_event_router.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/login/user_manager.h"
@@ -207,19 +206,14 @@ void ChromeShellDelegate::ToggleMaximized() {
ash::wm::ToggleMaximizedWindow(window);
}
-void ChromeShellDelegate::OpenFileManager(bool as_dialog) {
+void ChromeShellDelegate::OpenFileManager() {
#if defined(OS_CHROMEOS)
- if (as_dialog) {
- Browser* browser =
- chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
- // Open the select file dialog only if there is an active browser where the
- // selected file is displayed.
- if (browser) {
- browser->OpenFile();
- return;
- }
- } else {
- file_manager_util::OpenApplication();
+ Browser* browser =
+ chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
+ // Open the select file dialog only if there is an active browser where the
+ // selected file is displayed.
+ if (browser) {
+ browser->OpenFile();
}
#endif
}
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
index 568009f..b7dad20 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.h
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -48,7 +48,7 @@ class ChromeShellDelegate : public ash::ShellDelegate,
virtual void NewTab() OVERRIDE;
virtual void NewWindow(bool is_incognito) OVERRIDE;
virtual void ToggleMaximized() OVERRIDE;
- virtual void OpenFileManager(bool as_dialog) OVERRIDE;
+ virtual void OpenFileManager() OVERRIDE;
virtual void OpenCrosh() OVERRIDE;
virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
virtual void RestoreTab() OVERRIDE;