Remove unneeded functions in web_app.cc.

chrome/browser/web_applications/web_app.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/web_applications/web_app.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
@@ skipping 50 matching lines @@
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 // Predicator for sorting images from largest to smallest.
 bool IconPrecedes(const WebApplicationInfo::IconInfo& left,
                   const WebApplicationInfo::IconInfo& right) {
   return left.width < right.width;
 }
 #endif
 
-bool CreateShortcutsWithInfoOnFileThread(
-    web_app::ShortcutCreationReason reason,
-    const web_app::ShortcutLocations& locations,
-    const web_app::ShortcutInfo& shortcut_info,
-    const extensions::FileHandlersInfo& file_handlers_info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
-  base::FilePath shortcut_data_dir =
-      web_app::GetWebAppDataDirectory(shortcut_info.profile_path,
-                                      shortcut_info.extension_id,
-                                      shortcut_info.url);
-  return web_app::internals::CreatePlatformShortcuts(
-      shortcut_data_dir, shortcut_info, file_handlers_info, locations, reason);
-}
-
-void DeleteShortcutsOnFileThread(
-    const web_app::ShortcutInfo& shortcut_info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
-  base::FilePath shortcut_data_dir = web_app::GetWebAppDataDirectory(
-      shortcut_info.profile_path, shortcut_info.extension_id, GURL());
-  return web_app::internals::DeletePlatformShortcuts(
-      shortcut_data_dir, shortcut_info);
-}
-
-void UpdateShortcutsOnFileThread(
-    const base::string16& old_app_title,
-    const web_app::ShortcutInfo& shortcut_info,
-    const extensions::FileHandlersInfo& file_handlers_info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
-  base::FilePath shortcut_data_dir = web_app::GetWebAppDataDirectory(
-      shortcut_info.profile_path, shortcut_info.extension_id, GURL());
-  return web_app::internals::UpdatePlatformShortcuts(
-      shortcut_data_dir, old_app_title, shortcut_info, file_handlers_info);
+base::FilePath GetShortcutDataDir(const web_app::ShortcutInfo& shortcut_info) {
+  return web_app::GetWebAppDataDirectory(shortcut_info.profile_path,
+                                         shortcut_info.extension_id,
+                                         shortcut_info.url);
 }
 
 void CreateShortcutsWithInfo(
     web_app::ShortcutCreationReason reason,
     const web_app::ShortcutLocations& locations,
     const web_app::ShortcutInfo& shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(
-          base::IgnoreResult(&CreateShortcutsWithInfoOnFileThread),
-          reason, locations, shortcut_info, file_handlers_info));
+          base::IgnoreResult(&web_app::internals::CreatePlatformShortcuts),
+          GetShortcutDataDir(shortcut_info),
+          shortcut_info, file_handlers_info, locations, reason));
 }
 
 void UpdateAllShortcutsForShortcutInfo(
     const base::string16& old_app_title,
     const web_app::ShortcutInfo& shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info) {
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
-      base::Bind(&UpdateShortcutsOnFileThread,
+      base::Bind(&web_app::internals::UpdatePlatformShortcuts,
+                 GetShortcutDataDir(shortcut_info),
                  old_app_title, shortcut_info, file_handlers_info));
 }
 
 void OnImageLoaded(web_app::ShortcutInfo shortcut_info,
                    extensions::FileHandlersInfo file_handlers_info,
                    InfoCallback callback,
                    const gfx::ImageFamily& image_family) {
   // If the image failed to load (e.g. if the resource being loaded was empty)
   // use the standard application icon.
   if (image_family.empty()) {
@@ skipping 99 matching lines @@
 #endif
   file_util::ReplaceIllegalCharactersInPath(&file_name, '_');
   return base::FilePath(file_name);
 }
 
 bool CreateShortcutsOnFileThread(ShortcutCreationReason reason,
                                  const ShortcutLocations& locations,
                                  const ShortcutInfo& shortcut_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
-  return CreateShortcutsWithInfoOnFileThread(
-      reason, locations, shortcut_info, extensions::FileHandlersInfo());
+  return CreatePlatformShortcuts(
+      GetShortcutDataDir(shortcut_info),
+      shortcut_info, extensions::FileHandlersInfo(), locations, reason);
 }
 
 }  // namespace internals
 
 ShortcutInfo::ShortcutInfo()
     : is_platform_app(false) {
 }
 
 ShortcutInfo::~ShortcutInfo() {}
 
@@ skipping 87 matching lines @@
 
 base::FilePath GetWebAppDataDirectory(const base::FilePath& profile_path,
                                       const extensions::Extension& extension) {
   return GetWebAppDataDirectory(
       profile_path,
       extension.id(),
       GURL(extensions::AppLaunchInfo::GetLaunchWebURL(&extension)));
 }
 
 std::string GenerateApplicationNameFromInfo(const ShortcutInfo& shortcut_info) {
-  if (!shortcut_info.extension_id.empty()) {
+  if (!shortcut_info.extension_id.empty())
     return GenerateApplicationNameFromExtensionId(shortcut_info.extension_id);
-  } else {
+  else
     return GenerateApplicationNameFromURL(shortcut_info.url);
-  }
 }
 
 std::string GenerateApplicationNameFromURL(const GURL& url) {
   std::string t;
   t.append(url.host());
   t.append("_");
   t.append(url.path());
   return t;
 }
 
@@ skipping 30 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GetInfoForApp(app,
                 profile,
                 base::Bind(&CreateShortcutsWithInfo, reason, locations));
 }
 
 void DeleteAllShortcuts(Profile* profile, const extensions::Extension* app) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  ShortcutInfo shortcut_info =
+      ShortcutInfoForExtensionAndProfile(app, profile);
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
-      base::Bind(&DeleteShortcutsOnFileThread,
-                 ShortcutInfoForExtensionAndProfile(app, profile)));
+      base::Bind(&web_app::internals::DeletePlatformShortcuts,
+                 GetShortcutDataDir(shortcut_info), shortcut_info));
 }
 
 void UpdateAllShortcuts(const base::string16& old_app_title,
                         Profile* profile,
                         const extensions::Extension* app) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GetInfoForApp(app,
                 profile,
                 base::Bind(&UpdateAllShortcutsForShortcutInfo, old_app_title));
@@ skipping 36 matching lines @@
 
 #if defined(OS_LINUX)
 std::string GetWMClassFromAppName(std::string app_name) {
   file_util::ReplaceIllegalCharactersInPath(&app_name, '_');
   base::TrimString(app_name, "_", &app_name);
   return app_name;
 }
 #endif
 
 }  // namespace web_app