Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1997 matching lines...) Expand 10 before | Expand all | Expand 10 after
2008 } // namespace 2008 } // namespace
2009 2009
2010 std::string Experiment::NameForChoice(int index) const { 2010 std::string Experiment::NameForChoice(int index) const {
2011 DCHECK(type == Experiment::MULTI_VALUE || 2011 DCHECK(type == Experiment::MULTI_VALUE ||
2012 type == Experiment::ENABLE_DISABLE_VALUE); 2012 type == Experiment::ENABLE_DISABLE_VALUE);
2013 DCHECK_LT(index, num_choices); 2013 DCHECK_LT(index, num_choices);
2014 return std::string(internal_name) + testing::kMultiSeparator + 2014 return std::string(internal_name) + testing::kMultiSeparator +
2015 base::IntToString(index); 2015 base::IntToString(index);
2016 } 2016 }
2017 2017
2018 string16 Experiment::DescriptionForChoice(int index) const { 2018 base::string16 Experiment::DescriptionForChoice(int index) const {
2019 DCHECK(type == Experiment::MULTI_VALUE || 2019 DCHECK(type == Experiment::MULTI_VALUE ||
2020 type == Experiment::ENABLE_DISABLE_VALUE); 2020 type == Experiment::ENABLE_DISABLE_VALUE);
2021 DCHECK_LT(index, num_choices); 2021 DCHECK_LT(index, num_choices);
2022 int description_id; 2022 int description_id;
2023 if (type == Experiment::ENABLE_DISABLE_VALUE) { 2023 if (type == Experiment::ENABLE_DISABLE_VALUE) {
2024 const int kEnableDisableDescriptionIds[] = { 2024 const int kEnableDisableDescriptionIds[] = {
2025 IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, 2025 IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT,
2026 IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 2026 IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
2027 IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 2027 IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
2028 }; 2028 };
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
2352 } 2352 }
2353 2353
2354 const Experiment* GetExperiments(size_t* count) { 2354 const Experiment* GetExperiments(size_t* count) {
2355 *count = num_experiments; 2355 *count = num_experiments;
2356 return experiments; 2356 return experiments;
2357 } 2357 }
2358 2358
2359 } // namespace testing 2359 } // namespace testing
2360 2360
2361 } // namespace about_flags 2361 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.h ('k') | chrome/browser/accessibility/accessibility_extension_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698