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

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

Issue 1279873003: [Android] Add progress bar linear animation option. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use TextUtils.isEmpty Created 5 years, 4 months 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kV8CacheOptions, "none" }, 546 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kV8CacheOptions, "none" },
547 { IDS_FLAGS_V8_CACHE_OPTIONS_PARSE, switches::kV8CacheOptions, "parse" }, 547 { IDS_FLAGS_V8_CACHE_OPTIONS_PARSE, switches::kV8CacheOptions, "parse" },
548 { IDS_FLAGS_V8_CACHE_OPTIONS_CODE, switches::kV8CacheOptions, "code" }, 548 { IDS_FLAGS_V8_CACHE_OPTIONS_CODE, switches::kV8CacheOptions, "code" },
549 }; 549 };
550 550
551 #if defined(OS_ANDROID) 551 #if defined(OS_ANDROID)
552 const Experiment::Choice kProgressBarAnimationChoices[] = { 552 const Experiment::Choice kProgressBarAnimationChoices[] = {
553 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 553 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
554 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 554 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
555 switches::kProgressBarAnimation, "disabled" }, 555 switches::kProgressBarAnimation, "disabled" },
556 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_LINEAR,
557 switches::kProgressBarAnimation, "linear" },
556 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH, 558 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_SMOOTH,
557 switches::kProgressBarAnimation, "smooth" }, 559 switches::kProgressBarAnimation, "smooth" },
558 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START, 560 { IDS_FLAGS_PROGRESS_BAR_ANIMATION_FAST_START,
559 switches::kProgressBarAnimation, "fast-start" }, 561 switches::kProgressBarAnimation, "fast-start" },
560 }; 562 };
561 #endif // defined(OS_ANDROID) 563 #endif // defined(OS_ANDROID)
562 564
563 // RECORDING USER METRICS FOR FLAGS: 565 // RECORDING USER METRICS FOR FLAGS:
564 // ----------------------------------------------------------------------------- 566 // -----------------------------------------------------------------------------
565 // The first line of the experiment is the internal name. If you'd like to 567 // The first line of the experiment is the internal name. If you'd like to
(...skipping 2200 matching lines...) Expand 10 before | Expand all | Expand 10 after
2766 } 2768 }
2767 2769
2768 const Experiment* GetExperiments(size_t* count) { 2770 const Experiment* GetExperiments(size_t* count) {
2769 *count = num_experiments; 2771 *count = num_experiments;
2770 return experiments; 2772 return experiments;
2771 } 2773 }
2772 2774
2773 } // namespace testing 2775 } // namespace testing
2774 2776
2775 } // namespace about_flags 2777 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698