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

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

Issue 16282003: Translate: make alpha language support enabled by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase due to conflict in CQ Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/translate/translate_language_list.h » ('j') | 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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after
1403 #endif 1403 #endif
1404 #if defined(ENABLE_GOOGLE_NOW) 1404 #if defined(ENABLE_GOOGLE_NOW)
1405 { 1405 {
1406 "enable-google-now", 1406 "enable-google-now",
1407 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME, 1407 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME,
1408 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION, 1408 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION,
1409 kOsWin | kOsCrOS, 1409 kOsWin | kOsCrOS,
1410 SINGLE_VALUE_TYPE(switches::kEnableGoogleNowIntegration) 1410 SINGLE_VALUE_TYPE(switches::kEnableGoogleNowIntegration)
1411 }, 1411 },
1412 #endif 1412 #endif
1413 {
1414 "enable-translate-alpha-languages",
1415 IDS_FLAGS_ENABLE_TRANSLATE_ALPHA_LANGUAGES_NAME,
1416 IDS_FLAGS_ENABLE_TRANSLATE_ALPHA_LANGUAGES_DESCRIPTION,
1417 kOsAll,
1418 SINGLE_VALUE_TYPE(switches::kEnableTranslateAlphaLanguages)
1419 },
1420 #if defined(OS_CHROMEOS) 1413 #if defined(OS_CHROMEOS)
1421 { 1414 {
1422 "enable-virtual-keyboard", 1415 "enable-virtual-keyboard",
1423 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, 1416 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME,
1424 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, 1417 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION,
1425 kOsCrOS, 1418 kOsCrOS,
1426 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard) 1419 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)
1427 }, 1420 },
1428 #endif 1421 #endif
1429 { 1422 {
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
2020 } 2013 }
2021 2014
2022 const Experiment* GetExperiments(size_t* count) { 2015 const Experiment* GetExperiments(size_t* count) {
2023 *count = num_experiments; 2016 *count = num_experiments;
2024 return experiments; 2017 return experiments;
2025 } 2018 }
2026 2019
2027 } // namespace testing 2020 } // namespace testing
2028 2021
2029 } // namespace about_flags 2022 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/translate/translate_language_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698