Commit e2d8c0c7 authored by mtomasz@chromium.org's avatar mtomasz@chromium.org

Re-enable photo importer in Files.app.

It has been disabled because of bugs.

TEST=Enter usb drive, right click on the usb drive item in the left nav in Files.app, choose Import media.
BUG=176203

Review URL: https://codereview.chromium.org/12255024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182422 0039d316-1c4b-4281-b951-d872f2087c98
parent e75a2556
...@@ -673,9 +673,7 @@ void FileBrowserEventRouter::ShowRemovableDeviceInFileManager( ...@@ -673,9 +673,7 @@ void FileBrowserEventRouter::ShowRemovableDeviceInFileManager(
chromeos::ScreenLocker::default_screen_locker()) chromeos::ScreenLocker::default_screen_locker())
return; return;
// To enable Photo Import call file_manager_util::OpenActionChoiceDialog file_manager_util::OpenActionChoiceDialog(FilePath(mount_path));
// instead.
file_manager_util::ViewRemovableDrive(base::FilePath(mount_path));
} }
void FileBrowserEventRouter::OnDiskAdded( void FileBrowserEventRouter::OnDiskAdded(
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<command id="format" i18n-values="label:FORMAT_DEVICE_BUTTON_LABEL" <command id="format" i18n-values="label:FORMAT_DEVICE_BUTTON_LABEL"
></command> ></command>
<command id="import-photos" i18n-values="label:PHOTO_IMPORT_TITLE" <command id="import-photos" i18n-values="label:PHOTO_IMPORT_TITLE"
hidden></command> ></command>
<command id="volume-help" i18n-values="label:DRIVE_MENU_HELP" <command id="volume-help" i18n-values="label:DRIVE_MENU_HELP"
></command> ></command>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment