Merge: Be explicit about target type in platform_util::OpenItem()

chrome/utility/shell_handler_win.cc

 // Copyright 2014 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/utility/shell_handler_win.h"
 
 #include <commdlg.h>
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "content/public/utility/utility_thread.h"
 #include "ui/base/win/open_file_name_win.h"
 #include "ui/base/win/shell.h"
 
 ShellHandler::ShellHandler() {}
 ShellHandler::~ShellHandler() {}
 
 bool ShellHandler::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ShellHandler, message)
-    IPC_MESSAGE_HANDLER(ChromeUtilityMsg_OpenItemViaShell,
-                        OnOpenItemViaShell)
+    IPC_MESSAGE_HANDLER(ChromeUtilityMsg_OpenFileViaShell,
+                        OnOpenFileViaShell)
+    IPC_MESSAGE_HANDLER(ChromeUtilityMsg_OpenFolderViaShell,
+                        OnOpenFolderViaShell)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_GetOpenFileName,
                         OnGetOpenFileName)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_GetSaveFileName,
                         OnGetSaveFileName)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void ShellHandler::OnOpenItemViaShell(const base::FilePath& full_path) {
-  ui::win::OpenItemViaShell(full_path);
+void ShellHandler::OnOpenFileViaShell(const base::FilePath& full_path) {
+  ui::win::OpenFileViaShell(full_path);
+}
+
+void ShellHandler::OnOpenFolderViaShell(const base::FilePath& full_path) {
+  ui::win::OpenFolderViaShell(full_path);
 }
 
 void ShellHandler::OnGetOpenFileName(
     HWND owner,
     DWORD flags,
     const GetOpenFileNameFilter& filter,
     const base::FilePath& initial_directory,
     const base::FilePath& filename) {
   ui::win::OpenFileName open_file_name(owner, flags);
   open_file_name.SetInitialSelection(initial_directory, filename);
@@ skipping 36 matching lines @@
   }
 
   // Zero means the dialog was closed, otherwise we had an error.
   DWORD error_code = ::CommDlgExtendedError();
   if (error_code != 0)
     NOTREACHED() << "GetSaveFileName failed with code: " << error_code;
 
   content::UtilityThread::Get()->Send(
       new ChromeUtilityHostMsg_GetSaveFileName_Failed());
 }