Split the location flags from ShortcutInfo into a new struct ShortcutLocations.

The majority of code using ShortcutInfo ignores these flags, making it hard to
reason about exactly when they will be respected. Now ShortcutLocations is
explicitly passed in all the places where it is required (relatively few).
Generally, shortcut creation makes use of these flags, whereas shortcut update
and deletion does not.

In a few places (web_app_ui: ShortcutInfoForExtensionAndProfile,
web_app_ui: CheckExistingShortcuts) these booleans were being assigned to, but
never read back. Deleted those assignments.

BUG=178964


Review URL: https://chromiumcodereview.appspot.com/12382011

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

1 files changed, 8 insertions, 3 deletions

diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h
index a3e897c..2eac0df 100644
--- a/chrome/browser/shell_integration.h
+++ b/chrome/browser/shell_integration.h
@@ -103,15 +103,20 @@ class ShellIntegration {
     base::FilePath extension_path;
     gfx::Image favicon;
     base::FilePath profile_path;
+  };
+
+  // Info about which locations to create app shortcuts in.
+  struct ShortcutLocations {
+    ShortcutLocations();
 
-    bool create_on_desktop;
-    bool create_in_applications_menu;
+    bool on_desktop;
+    bool in_applications_menu;
 
     // For Windows, this refers to quick launch bar prior to Win7. In Win7,
     // this means "pin to taskbar". For Mac/Linux, this could be used for
     // Mac dock or the gnome/kde application launcher. However, those are not
     // implemented yet.
-    bool create_in_quick_launch_bar;
+    bool in_quick_launch_bar;
   };
 
   // Data that needs to be passed between the app launcher stub and Chrome.