| 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 <stddef.h> |
| 8 |
| 9 #include "base/macros.h" |
| 8 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| 9 | 11 |
| 10 namespace switches { | 12 namespace switches { |
| 11 | 13 |
| 12 // Switches enumerated here will be removed when a background instance of | 14 // 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, | 15 // 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 | 16 // 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. | 17 // pick up an automatic update, be sure to add it to this list. |
| 16 const char* const kSwitchesToRemoveOnAutorestart[] = { | 18 const char* const kSwitchesToRemoveOnAutorestart[] = { |
| 17 switches::kApp, | 19 switches::kApp, |
| 18 switches::kAppId, | 20 switches::kAppId, |
| 19 switches::kForceFirstRun, | 21 switches::kForceFirstRun, |
| 20 switches::kMakeDefaultBrowser, | 22 switches::kMakeDefaultBrowser, |
| 21 switches::kNoStartupWindow, | 23 switches::kNoStartupWindow, |
| 22 switches::kRestoreLastSession, | 24 switches::kRestoreLastSession, |
| 23 switches::kShowAppList, | 25 switches::kShowAppList, |
| 24 switches::kWinJumplistAction | 26 switches::kWinJumplistAction |
| 25 }; | 27 }; |
| 26 | 28 |
| 27 void RemoveSwitchesForAutostart( | 29 void RemoveSwitchesForAutostart( |
| 28 std::map<std::string, base::CommandLine::StringType>* switch_list) { | 30 std::map<std::string, base::CommandLine::StringType>* switch_list) { |
| 29 for (size_t i = 0; i < arraysize(kSwitchesToRemoveOnAutorestart); ++i) | 31 for (size_t i = 0; i < arraysize(kSwitchesToRemoveOnAutorestart); ++i) |
| 30 switch_list->erase(kSwitchesToRemoveOnAutorestart[i]); | 32 switch_list->erase(kSwitchesToRemoveOnAutorestart[i]); |
| 31 } | 33 } |
| 32 | 34 |
| 33 } // namespace switches | 35 } // namespace switches |
| OLD | NEW |