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

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

Issue 328143004: Change branding of Quickoffice flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 5 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/chromeos_strings.grdp ('k') | chrome/browser/extensions/component_loader.cc » ('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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 MULTI_VALUE_TYPE(kEnableFileManagerNewGalleryChoices) 1039 MULTI_VALUE_TYPE(kEnableFileManagerNewGalleryChoices)
1040 }, 1040 },
1041 { 1041 {
1042 "enable-video-player-chromecast-support", 1042 "enable-video-player-chromecast-support",
1043 IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_NAME, 1043 IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_NAME,
1044 IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_DESCRIPTION, 1044 IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_DESCRIPTION,
1045 kOsCrOS, 1045 kOsCrOS,
1046 SINGLE_VALUE_TYPE(chromeos::switches::kEnableVideoPlayerChromecastSupport) 1046 SINGLE_VALUE_TYPE(chromeos::switches::kEnableVideoPlayerChromecastSupport)
1047 }, 1047 },
1048 { 1048 {
1049 "disable-quickoffice-component-app", 1049 "disable-office-editing-component-app",
1050 IDS_FLAGS_DISABLE_QUICKOFFICE_COMPONENT_APP_NAME, 1050 IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_NAME,
1051 IDS_FLAGS_DISABLE_QUICKOFFICE_COMPONENT_APP_DESCRIPTION, 1051 IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION,
1052 kOsCrOS, 1052 kOsCrOS,
1053 SINGLE_VALUE_TYPE(chromeos::switches::kDisableQuickofficeComponentApp), 1053 SINGLE_VALUE_TYPE(chromeos::switches::kDisableOfficeEditingComponentApp),
1054 }, 1054 },
1055 { 1055 {
1056 "disable-saml-signin", 1056 "disable-saml-signin",
1057 IDS_FLAGS_DISABLE_SAML_SIGNIN_NAME, 1057 IDS_FLAGS_DISABLE_SAML_SIGNIN_NAME,
1058 IDS_FLAGS_DISABLE_SAML_SIGNIN_DESCRIPTION, 1058 IDS_FLAGS_DISABLE_SAML_SIGNIN_DESCRIPTION,
1059 kOsCrOS, 1059 kOsCrOS,
1060 SINGLE_VALUE_TYPE(chromeos::switches::kDisableSamlSignin), 1060 SINGLE_VALUE_TYPE(chromeos::switches::kDisableSamlSignin),
1061 }, 1061 },
1062 { 1062 {
1063 "disable-display-color-calibration", 1063 "disable-display-color-calibration",
(...skipping 1425 matching lines...) Expand 10 before | Expand all | Expand 10 after
2489 } 2489 }
2490 2490
2491 const Experiment* GetExperiments(size_t* count) { 2491 const Experiment* GetExperiments(size_t* count) {
2492 *count = num_experiments; 2492 *count = num_experiments;
2493 return experiments; 2493 return experiments;
2494 } 2494 }
2495 2495
2496 } // namespace testing 2496 } // namespace testing
2497 2497
2498 } // namespace about_flags 2498 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698