Re-enable photo importer in Files.app.

chrome/browser/chromeos/extensions/file_browser_event_router.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 655 matching lines @@
 }
 
 void FileBrowserEventRouter::ShowRemovableDeviceInFileManager(
     const std::string& mount_path) {
   // Do not attempt to open File Manager while the login is in progress or
   // the screen is locked.
   if (chromeos::BaseLoginDisplayHost::default_host() ||
       chromeos::ScreenLocker::default_screen_locker())
     return;
 
-  // To enable Photo Import call file_manager_util::OpenActionChoiceDialog
-  // instead.
-  file_manager_util::ViewRemovableDrive(base::FilePath(mount_path));
+  file_manager_util::OpenActionChoiceDialog(FilePath(mount_path));

[hashimoto, 2013/02/14 08:30:18]

nit: It seems no one uses ViewRemovableDrive after this change, can we remove
it?

[mtomasz, 2013/02/14 08:43:39]

I'm going to use it in m27. The loader will not be launched for any removable
drive other than sd cards.

[hashimoto, 2013/02/14 08:46:37]

OK, sgtm.

 }
 
 void FileBrowserEventRouter::OnDiskAdded(
     const DiskMountManager::Disk* disk) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   VLOG(1) << "Disk added: " << disk->device_path();
   if (disk->device_path().empty()) {
     VLOG(1) << "Empty system path for " << disk->device_path();
     return;
@@ skipping 184 matching lines @@
 }
 
 bool FileBrowserEventRouter::FileWatcherExtensions::Watch(
     const base::FilePath& path,
     const base::FilePathWatcher::Callback& callback) {
   if (is_remote_file_system_)
     return true;
 
   return file_watcher_->Watch(path, false, callback);
 }