Added File manager to wrench/Tools menu. Added ctrl+M acceletator for openining it directly.

BUG=chromium-os:14704
TEST=make sure File manager shows up in wrench / tools menu. Also ctrl+M should open it.
Review URL: http://codereview.chromium.org/6903157

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83666 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 22 insertions, 21 deletions

diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
index 7f7b0c7..5d870da 100644
--- a/chrome/app/chrome_command_ids.h
+++ b/chrome/app/chrome_command_ids.h
@@ -162,6 +162,7 @@
 #define IDC_VIEW_BACKGROUND_PAGES       40028
 #define IDC_SHOW_KEYBOARD_OVERLAY       40029
 #define IDC_PROFILING_ENABLED           40030
+#define IDC_FILE_MANAGER                40031
 
 // Spell-check
 // Insert any additional suggestions before _LAST; these have to be consecutive.
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index db4dcd6..096f4a1 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -941,6 +941,9 @@ Other platform defines such as use_titlecase are declared in build/common.gypi.
         <message name="IDS_DEV_TOOLS_CONSOLE" desc="The text label of the JavaScript console menu item">
           &amp;JavaScript console
         </message>
+        <message name="IDS_FILE_MANAGER" desc="The text label of the File Manager menu item">
+          &amp;File manager
+        </message>
         <message name="IDS_TASK_MANAGER" desc="The text label of the Task Manager menu item">
           &amp;Task manager
         </message>
@@ -964,6 +967,9 @@ Other platform defines such as use_titlecase are declared in build/common.gypi.
         <message name="IDS_DEV_TOOLS_CONSOLE" desc="In Title Case: The text label of the JavaScript console menu item">
           &amp;JavaScript Console
         </message>
+        <message name="IDS_FILE_MANAGER" desc="The text label of the File Manager menu item">
+          &amp;File Manager
+        </message>
         <message name="IDS_TASK_MANAGER" desc="In Title Case: The text label of the Task Manager menu item">
           &amp;Task Manager
         </message>
@@ -4036,18 +4042,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_TABPOSE_DESCRIPTION" desc="Description of the 'Tab Overview' lab.">
         Swipe down with three fingers on your trackpad to see an overview of all your tabs. Click on a thumbnail to select it. Works great in fullscreen mode.
       </message>
-      <message name="IDS_FLAGS_MEDIA_PLAYER_NAME" desc="Name of the 'Media Player' lab.">
-        Media Player
-      </message>
-      <message name="IDS_FLAGS_MEDIA_PLAYER_DESCRIPTION" desc="Description of the 'Media Player' lab.">
-        Enable Media Player.
-      </message>
-      <message name="IDS_FLAGS_ADVANCED_FS_NAME" desc="Name of the 'Advanced File System' lab.">
-        Advanced File System
-      </message>
-      <message name="IDS_FLAGS_ADVANCED_FS_DESCRIPTION" desc="Description of the 'Advanced File System' lab.">
-        Enable Advanced File System, including USB and SD card support.
-      </message>
       <message name="IDS_FLAGS_SIDE_TABS_NAME" desc="Name of the 'Left Tabs' lab.">
         Side Tabs
       </message>
@@ -9697,12 +9691,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
     <message name="IDS_FILEBROWSER_OPEN" desc="Open Button text">
       Open
     </message>
-    <message name="IDS_FILEBROWSER_UPLOAD_PICASAWEB" desc="Upload to picasaweb menu item">
-      Picasa Web
-    </message>
-    <message name="IDS_FILEBROWSER_UPLOAD_FLICKR" desc="Upload to Flickr menu item">
-      Flickr
-    </message>
     <message name="IDS_FILEBROWSER_UPLOAD_EMAIL" desc="Upload to email menu item">
       Email
     </message>
diff --git a/chrome/browser/extensions/file_manager_util.h b/chrome/browser/extensions/file_manager_util.h
index 2553ef5..8d63f3b 100644
--- a/chrome/browser/extensions/file_manager_util.h
+++ b/chrome/browser/extensions/file_manager_util.h
@@ -15,6 +15,8 @@ class Profile;
 // Helper class for wiring file browser component extension with the rest of UI.
 class FileManagerUtil {
  public:
+  // Gets base file browser url.
+  static GURL GetFileBrowserUrl();
   // Converts |full_file_path| into external filesystem: url. Returns false
   // if |full_file_path| is not managed by the external filesystem provider.
   static bool ConvertFileToFileSystemUrl(Profile* profile,
@@ -32,13 +34,10 @@ class FileManagerUtil {
   // |default_path|.
   static void ShowFullTabUrl(Profile* profile,
                              const FilePath& default_path);
-
  private:
   FileManagerUtil() {}
   // Helper to convert numeric dialog type to a string.
   static std::string GetDialogTypeAsString(SelectFileDialog::Type dialog_type);
-  // Gets base file browser url.
-  static GURL GetFileBrowserUrl();
   // Help to convert potential dialog arguments into json.
   static std::string GetArgumentsJson(
       SelectFileDialog::Type type,
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 04498e5..edebe56 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -146,6 +146,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
+#include "chrome/browser/extensions/file_manager_util.h"
 #endif
 
 using base::TimeDelta;
@@ -1981,6 +1982,11 @@ void Browser::OpenSearchEngineOptionsDialog() {
 }
 
 #if defined(OS_CHROMEOS)
+void Browser::OpenFileManager() {
+  UserMetrics::RecordAction(UserMetricsAction("OpenFileManager"));
+  ShowSingletonTab(FileManagerUtil::GetFileBrowserUrl());
+}
+
 void Browser::OpenSystemOptionsDialog() {
   UserMetrics::RecordAction(UserMetricsAction("OpenSystemOptionsDialog"));
   ShowOptionsTab(chrome::kSystemOptionsSubPage);
@@ -2311,6 +2317,7 @@ void Browser::ExecuteCommandWithDisposition(
     case IDC_VIEW_INCOMPATIBILITIES: ShowAboutConflictsTab();         break;
     case IDC_HELP_PAGE:             OpenHelpTab();                    break;
 #if defined(OS_CHROMEOS)
+    case IDC_FILE_MANAGER:          OpenFileManager();                break;
     case IDC_SYSTEM_OPTIONS:        OpenSystemOptionsDialog();        break;
     case IDC_INTERNET_OPTIONS:      OpenInternetOptionsDialog();      break;
     case IDC_LANGUAGE_OPTIONS:      OpenLanguageOptionsDialog();      break;
@@ -3655,6 +3662,7 @@ void Browser::InitCommandState() {
   command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true);
 
 #if defined(OS_CHROMEOS)
+  command_updater_.UpdateCommandEnabled(IDC_FILE_MANAGER, true);
   command_updater_.UpdateCommandEnabled(IDC_SEARCH, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_KEYBOARD_OVERLAY, true);
   command_updater_.UpdateCommandEnabled(IDC_SYSTEM_OPTIONS, true);
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 2ed6768..940f421 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -566,6 +566,7 @@ class Browser : public TabHandlerDelegate,
   void OpenPrivacyDashboardTabAndActivate();
   void OpenSearchEngineOptionsDialog();
 #if defined(OS_CHROMEOS)
+  void OpenFileManager();
   void OpenSystemOptionsDialog();
   void OpenInternetOptionsDialog();
   void OpenLanguageOptionsDialog();
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index e8dd206..2d869c8 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -168,6 +168,9 @@ void ToolsMenuModel::Build(Browser* browser) {
 #endif
 
   AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
+#if defined(OS_CHROMEOS)
+  AddItemWithStringId(IDC_FILE_MANAGER, IDS_FILE_MANAGER);
+#endif
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
 
diff --git a/chrome/browser/ui/views/accelerator_table_gtk.cc b/chrome/browser/ui/views/accelerator_table_gtk.cc
index f95b04d..a2ac711 100644
--- a/chrome/browser/ui/views/accelerator_table_gtk.cc
+++ b/chrome/browser/ui/views/accelerator_table_gtk.cc
@@ -111,6 +111,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
   { ui::VKEY_T,              true,  true,  false, IDC_RESTORE_TAB },
   { ui::VKEY_S,              false, true,  false, IDC_SAVE_PAGE },
 #if defined(OS_CHROMEOS)
+  { ui::VKEY_M,              false, true,  false, IDC_FILE_MANAGER },
   { ui::VKEY_LWIN,           false, false, false, IDC_SEARCH },
 #endif
   { ui::VKEY_9,              false, true,  false, IDC_SELECT_LAST_TAB },