| 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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 890 return chrome::RESULT_CODE_EULA_REFUSED; | 890 return chrome::RESULT_CODE_EULA_REFUSED; |
| 891 | 891 |
| 892 if (!parsed_command_line().HasSwitch(switches::kApp) && | 892 if (!parsed_command_line().HasSwitch(switches::kApp) && |
| 893 !parsed_command_line().HasSwitch(switches::kAppId) && | 893 !parsed_command_line().HasSwitch(switches::kAppId) && |
| 894 !parsed_command_line().HasSwitch(switches::kShowAppList)) { | 894 !parsed_command_line().HasSwitch(switches::kShowAppList)) { |
| 895 AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); | 895 AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); |
| 896 } | 896 } |
| 897 | 897 |
| 898 // TODO(macourteau): refactor preferences that are copied from | 898 // TODO(macourteau): refactor preferences that are copied from |
| 899 // master_preferences into local_state, as a "local_state" section in | 899 // master_preferences into local_state, as a "local_state" section in |
| 900 // master preferences. If possible, a generic solution would be prefered | 900 // master preferences. If possible, a generic solution would be preferred |
| 901 // over a copy one-by-one of specific preferences. Also see related TODO | 901 // over a copy one-by-one of specific preferences. Also see related TODO |
| 902 // in first_run.h. | 902 // in first_run.h. |
| 903 | 903 |
| 904 // Store the initial VariationsService seed in local state, if it exists | 904 // Store the initial VariationsService seed in local state, if it exists |
| 905 // in master prefs. | 905 // in master prefs. |
| 906 if (!master_prefs_->variations_seed.empty()) { | 906 if (!master_prefs_->variations_seed.empty()) { |
| 907 local_state_->SetString(prefs::kVariationsSeed, | 907 local_state_->SetString(prefs::kVariationsSeed, |
| 908 master_prefs_->variations_seed); | 908 master_prefs_->variations_seed); |
| 909 if (!master_prefs_->variations_seed_signature.empty()) { | 909 if (!master_prefs_->variations_seed_signature.empty()) { |
| 910 local_state_->SetString(prefs::kVariationsSeedSignature, | 910 local_state_->SetString(prefs::kVariationsSeedSignature, |
| (...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1659 chromeos::CrosSettings::Shutdown(); | 1659 chromeos::CrosSettings::Shutdown(); |
| 1660 #endif | 1660 #endif |
| 1661 #endif | 1661 #endif |
| 1662 } | 1662 } |
| 1663 | 1663 |
| 1664 // Public members: | 1664 // Public members: |
| 1665 | 1665 |
| 1666 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1666 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1667 chrome_extra_parts_.push_back(parts); | 1667 chrome_extra_parts_.push_back(parts); |
| 1668 } | 1668 } |
| OLD | NEW |