UpdateShortcutInfoAndIconForApp: Make Extension argument into a pointer.

This simplifies all the usages of it.

Patch originally written by jackhou.

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

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

7 files changed, 13 insertions, 13 deletions

diff --git a/chrome/browser/apps/shortcut_manager.cc b/chrome/browser/apps/shortcut_manager.cc
index 07b489b..c135d6e 100644
--- a/chrome/browser/apps/shortcut_manager.cc
+++ b/chrome/browser/apps/shortcut_manager.cc
@@ -132,7 +132,7 @@ void AppShortcutManager::Observe(int type,
         create_or_update = base::Bind(&CreateShortcutsInApplicationsMenu);
       }
       if (!create_or_update.is_null()) {
-        web_app::UpdateShortcutInfoAndIconForApp(*extension, profile_,
+        web_app::UpdateShortcutInfoAndIconForApp(extension, profile_,
                                                  create_or_update);
       }
       break;
@@ -189,7 +189,7 @@ void AppShortcutManager::OnceOffCreateShortcuts() {
        it != apps->end(); ++it) {
     if (ShouldCreateShortcutFor(it->get()))
       web_app::UpdateShortcutInfoAndIconForApp(
-          *it->get(), profile_, base::Bind(&CreateShortcutsInApplicationsMenu));
+          it->get(), profile_, base::Bind(&CreateShortcutsInApplicationsMenu));
   }
 }
 
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc
index 3a92ba8..fa7e8e6 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -244,7 +244,7 @@ void AppListViewDelegate::GetShortcutPathForApp(
                                       GURL()));
 
   web_app::UpdateShortcutInfoAndIconForApp(
-      *extension,
+      extension,
       profile_,
       base::Bind(CreateShortcutInWebAppDir, app_data_dir, callback));
 #else
diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
index c95a5fa..a9d721d 100644
--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
@@ -331,7 +331,7 @@ CreateChromeApplicationShortcutsDialogGtk::
 
   // Get shortcut information and icon now; they are needed for our UI.
   web_app::UpdateShortcutInfoAndIconForApp(
-      *app, profile,
+      app, profile,
       base::Bind(
           &CreateChromeApplicationShortcutsDialogGtk::OnShortcutInfoLoaded,
           this));
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index fca0654..d2d90a7 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -533,7 +533,7 @@ CreateChromeApplicationShortcutView::CreateChromeApplicationShortcutView(
 
   // Get shortcut information and icon now; they are needed for our UI.
   web_app::UpdateShortcutInfoAndIconForApp(
-      *app, profile,
+      app, profile,
       base::Bind(&CreateChromeApplicationShortcutView::OnShortcutInfoLoaded,
                  weak_ptr_factory_.GetWeakPtr()));
 }
diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc
index 4a6adb3..8a5bf2a 100644
--- a/chrome/browser/ui/web_applications/web_app_ui.cc
+++ b/chrome/browser/ui/web_applications/web_app_ui.cc
@@ -425,18 +425,18 @@ void UpdateShortcutInfoForApp(const extensions::Extension& app,
 }
 
 void UpdateShortcutInfoAndIconForApp(
-    const extensions::Extension& extension,
+    const extensions::Extension* extension,
     Profile* profile,
     const web_app::ShortcutInfoCallback& callback) {
   ShellIntegration::ShortcutInfo shortcut_info =
-      ShortcutInfoForExtensionAndProfile(&extension, profile);
+      ShortcutInfoForExtensionAndProfile(extension, profile);
 
   std::vector<extensions::ImageLoader::ImageRepresentation> info_list;
   for (size_t i = 0; i < kNumDesiredSizes; ++i) {
     int size = kDesiredSizes[i];
     extensions::ExtensionResource resource =
         extensions::IconsInfo::GetIconResource(
-            &extension, size, ExtensionIconSet::MATCH_EXACTLY);
+            extension, size, ExtensionIconSet::MATCH_EXACTLY);
     if (!resource.empty()) {
       info_list.push_back(extensions::ImageLoader::ImageRepresentation(
           resource,
@@ -455,10 +455,10 @@ void UpdateShortcutInfoAndIconForApp(
     // so look for a larger icon first:
     extensions::ExtensionResource resource =
         extensions::IconsInfo::GetIconResource(
-            &extension, size, ExtensionIconSet::MATCH_BIGGER);
+            extension, size, ExtensionIconSet::MATCH_BIGGER);
     if (resource.empty()) {
       resource = extensions::IconsInfo::GetIconResource(
-          &extension, size, ExtensionIconSet::MATCH_SMALLER);
+          extension, size, ExtensionIconSet::MATCH_SMALLER);
     }
     info_list.push_back(extensions::ImageLoader::ImageRepresentation(
         resource,
@@ -471,7 +471,7 @@ void UpdateShortcutInfoAndIconForApp(
   // LoadImageFamilyAsync will call the OnImageLoaded callback with an empty
   // image and exit immediately.
   extensions::ImageLoader::Get(profile)->LoadImageFamilyAsync(
-      &extension,
+      extension,
       info_list,
       base::Bind(&OnImageLoaded, shortcut_info, callback));
 }
diff --git a/chrome/browser/ui/web_applications/web_app_ui.h b/chrome/browser/ui/web_applications/web_app_ui.h
index 19ee0ce..6496974 100644
--- a/chrome/browser/ui/web_applications/web_app_ui.h
+++ b/chrome/browser/ui/web_applications/web_app_ui.h
@@ -47,7 +47,7 @@ void UpdateShortcutInfoForApp(const extensions::Extension& extension,
 // Fetches the icon for |extension| and calls |callback| with shortcut info
 // filled out as by UpdateShortcutInfoForApp.
 void UpdateShortcutInfoAndIconForApp(
-    const extensions::Extension& extension,
+    const extensions::Extension* extension,
     Profile* profile,
     const ShortcutInfoCallback& callback);
 
diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm
index ba8e4f6..3edfc4e 100644
--- a/chrome/browser/web_applications/web_app_mac.mm
+++ b/chrome/browser/web_applications/web_app_mac.mm
@@ -440,7 +440,7 @@ void ShowCreateChromeAppShortcutsDialog(gfx::NativeWindow /*parent_window*/,
   // Normally we would show a dialog, but since we always create the app
   // shortcut in /Applications there are no options for the user to choose.
   web_app::UpdateShortcutInfoAndIconForApp(
-      *app, profile,
+      app, profile,
       base::Bind(&CreateShortcutsAndRunCallback, close_callback));
 }