Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2219)

Unified Diff: chrome/browser/profiles/profile_shortcut_manager_win.cc

Issue 12300036: Fix spurious profile shortcuts created with a system-level install. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_shortcut_manager_win.cc
===================================================================
--- chrome/browser/profiles/profile_shortcut_manager_win.cc (revision 183222)
+++ chrome/browser/profiles/profile_shortcut_manager_win.cc (working copy)
@@ -650,6 +650,15 @@
string16 old_shortcut_appended_name =
cache->GetShortcutNameOfProfileAtIndex(profile_index);
+ // Exit early if the mode is to update existing profile shortcuts only and
+ // none were ever created for this profile, per the shortcut name not being
+ // set in the profile info cache.
+ if (old_shortcut_appended_name.empty() &&
+ create_mode == UPDATE_EXISTING_ONLY &&
+ action == IGNORE_NON_PROFILE_SHORTCUTS) {
+ return;
+ }
+
string16 new_shortcut_appended_name;
if (!remove_badging)
new_shortcut_appended_name = cache->GetNameOfProfileAtIndex(profile_index);
« no previous file with comments | « chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698