OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/common/switch_utils.h" | 5 #include "chrome/common/switch_utils.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
9 | 9 |
10 namespace switches { | 10 namespace switches { |
11 | 11 |
12 // Switches enumerated here will be removed when a background instance of | 12 // Switches enumerated here will be removed when a background instance of |
13 // Chrome restarts itself. If your key is designed to only be used once, | 13 // Chrome restarts itself. If your key is designed to only be used once, |
14 // or if it does not make sense when restarting a background instance to | 14 // or if it does not make sense when restarting a background instance to |
15 // pick up an automatic update, be sure to add it to this list. | 15 // pick up an automatic update, be sure to add it to this list. |
16 const char* const kSwitchesToRemoveOnAutorestart[] = { | 16 const char* const kSwitchesToRemoveOnAutorestart[] = { |
| 17 switches::kActivateExistingProfileBrowser, |
17 switches::kApp, | 18 switches::kApp, |
18 switches::kAppId, | 19 switches::kAppId, |
19 switches::kForceFirstRun, | 20 switches::kForceFirstRun, |
20 switches::kMakeDefaultBrowser, | 21 switches::kMakeDefaultBrowser, |
21 switches::kNoStartupWindow, | 22 switches::kNoStartupWindow, |
22 switches::kRestoreLastSession, | 23 switches::kRestoreLastSession, |
23 switches::kShowAppList, | 24 switches::kShowAppList, |
| 25 switches::kWinJumplistAction |
24 }; | 26 }; |
25 | 27 |
26 void RemoveSwitchesForAutostart( | 28 void RemoveSwitchesForAutostart( |
27 std::map<std::string, CommandLine::StringType>* switch_list) { | 29 std::map<std::string, CommandLine::StringType>* switch_list) { |
28 for (size_t i = 0; i < arraysize(kSwitchesToRemoveOnAutorestart); ++i) | 30 for (size_t i = 0; i < arraysize(kSwitchesToRemoveOnAutorestart); ++i) |
29 switch_list->erase(kSwitchesToRemoveOnAutorestart[i]); | 31 switch_list->erase(kSwitchesToRemoveOnAutorestart[i]); |
30 } | 32 } |
31 | 33 |
32 } // namespace switches | 34 } // namespace switches |
OLD | NEW |