Chromium Code Reviews| Index: chrome/browser/ui/browser_init.cc |
| diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc |
| index 2e8a1378eb8406e72ebfc2461e2835c9595156bf..3cfb73d6f5275cbc20390fc24e9811a97cc80716 100644 |
| --- a/chrome/browser/ui/browser_init.cc |
| +++ b/chrome/browser/ui/browser_init.cc |
| @@ -127,6 +127,7 @@ |
| #endif |
| #if defined(OS_WIN) |
| +#include "base/win/windows_version.h" |
| #include "chrome/installer/util/auto_launch_util.h" |
| #endif |
| @@ -492,7 +493,7 @@ enum LaunchMode { |
| LM_SHORTCUT_UNKNOWN, // Launched from user-defined shortcut. |
| LM_SHORTCUT_QUICKLAUNCH, // Launched from the quick launch bar. |
| LM_SHORTCUT_DESKTOP, // Launched from a desktop shortcut. |
| - LM_SHORTCUT_STARTMENU, // Launched from start menu. |
| + LM_SHORTCUT_TASKBAR, // Launched from task bar. |
|
cpu_(ooo_6.6-7.5)
2012/03/02 00:45:14
I believe is called "taskbar" but I could be wrong
benwells
2012/03/02 00:58:53
Done.
|
| LM_LINUX_MAC_BEOS // Other OS buckets start here. |
| }; |
| @@ -509,7 +510,10 @@ LaunchMode GetLaunchShortcutKind() { |
| std::wstring shortcut(si.lpTitle); |
| // The windows quick launch path is not localized. |
| if (shortcut.find(L"\\Quick Launch\\") != std::wstring::npos) |
| - return LM_SHORTCUT_QUICKLAUNCH; |
| + if (base::win::GetVersion() >= base::win::VERSION_WIN7) |
|
cpu_(ooo_6.6-7.5)
2012/03/02 00:45:14
use { in line 512.
If statements without {} are f
benwells
2012/03/02 00:58:53
Done.
|
| + return LM_SHORTCUT_TASKBAR; |
| + else |
| + return LM_SHORTCUT_QUICKLAUNCH; |
| scoped_ptr<base::Environment> env(base::Environment::Create()); |
| std::string appdata_path; |
| env->GetVar("USERPROFILE", &appdata_path); |