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