Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/profiles/profile_shortcut_manager_win.h" | 5 #include "chrome/browser/profiles/profile_shortcut_manager_win.h" |
| 6 | 6 |
| 7 #include <shlobj.h> // For SHChangeNotify(). | 7 #include <shlobj.h> // For SHChangeNotify(). |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 625 shortcut_name.append(L" - "); | 625 shortcut_name.append(L" - "); |
| 626 shortcut_name.append(l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)); | 626 shortcut_name.append(l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)); |
| 627 } else { | 627 } else { |
| 628 shortcut_name.append( | 628 shortcut_name.append( |
| 629 distribution->GetShortcutName(BrowserDistribution::SHORTCUT_CHROME)); | 629 distribution->GetShortcutName(BrowserDistribution::SHORTCUT_CHROME)); |
| 630 } | 630 } |
| 631 return shortcut_name + installer::kLnkExt; | 631 return shortcut_name + installer::kLnkExt; |
| 632 } | 632 } |
| 633 | 633 |
| 634 base::string16 CreateProfileShortcutFlags(const base::FilePath& profile_path) { | 634 base::string16 CreateProfileShortcutFlags(const base::FilePath& profile_path) { |
| 635 return base::StringPrintf(L"--%ls=\"%ls\"", | 635 return L"";/* base::StringPrintf(L"--%ls=\"%ls\"", |
|
brucedawson
2015/10/20 21:43:00
String printing of ASCIIToUTF16 and profile_path.
| |
| 636 base::ASCIIToUTF16( | 636 base::ASCIIToUTF16( |
| 637 switches::kProfileDirectory).c_str(), | 637 switches::kProfileDirectory).c_str(), |
| 638 profile_path.BaseName().value().c_str()); | 638 profile_path.BaseName().value().c_str());*/ |
| 639 } | 639 } |
| 640 | 640 |
| 641 } // namespace internal | 641 } // namespace internal |
| 642 } // namespace profiles | 642 } // namespace profiles |
| 643 | 643 |
| 644 // static | 644 // static |
| 645 bool ProfileShortcutManager::IsFeatureEnabled() { | 645 bool ProfileShortcutManager::IsFeatureEnabled() { |
| 646 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 646 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 647 return command_line->HasSwitch(switches::kEnableProfileShortcutManager) || | 647 return command_line->HasSwitch(switches::kEnableProfileShortcutManager) || |
| 648 (BrowserDistribution::GetDistribution()->CanCreateDesktopShortcuts() && | 648 (BrowserDistribution::GetDistribution()->CanCreateDesktopShortcuts() && |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 865 // Ensure the profile's icon file has been created. | 865 // Ensure the profile's icon file has been created. |
| 866 CreateOrUpdateProfileIcon(profile->GetPath()); | 866 CreateOrUpdateProfileIcon(profile->GetPath()); |
| 867 } | 867 } |
| 868 break; | 868 break; |
| 869 } | 869 } |
| 870 default: | 870 default: |
| 871 NOTREACHED(); | 871 NOTREACHED(); |
| 872 break; | 872 break; |
| 873 } | 873 } |
| 874 } | 874 } |
| OLD | NEW |