diff options
Diffstat (limited to 'chrome/browser')
4 files changed, 8 insertions, 21 deletions
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc index 814bffa..149140e 100644 --- a/chrome/browser/chromeos/extensions/file_manager_util.cc +++ b/chrome/browser/chromeos/extensions/file_manager_util.cc @@ -597,10 +597,6 @@ void ViewFolder(const FilePath& path) { OpenFileBrowser(path, REUSE_SAME_PATH, "open"); } -void OpenApplication() { - OpenFileBrowser(FilePath(), REUSE_NEVER, ""); -} - bool ExecuteDefaultHandler(Profile* profile, const FilePath& path) { GURL url; if (!ConvertFileToFileSystemUrl(profile, path, diff --git a/chrome/browser/chromeos/extensions/file_manager_util.h b/chrome/browser/chromeos/extensions/file_manager_util.h index d0b5813..d71a709 100644 --- a/chrome/browser/chromeos/extensions/file_manager_util.h +++ b/chrome/browser/chromeos/extensions/file_manager_util.h @@ -78,9 +78,6 @@ void ViewFile(const FilePath& path); // Opens file browser on the folder containing the file, with the file selected. void ShowFileInFolder(const FilePath& path); -// Opens file browser application. -void OpenApplication(); - // Executes the built-in File Manager handler or tries to open |file| directly // in the browser. Returns false if neither is possible. bool ExecuteBuiltinHandler( 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; |