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

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

Issue 2552903003: Remove unreleased web app frame code from ChromeOS (Closed)
Patch Set: Nits Created 4 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
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 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after
1407 #endif // OS_ANDROID 1407 #endif // OS_ANDROID
1408 {"enable-hotword-hardware", IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_NAME, 1408 {"enable-hotword-hardware", IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_NAME,
1409 IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, kOsCrOS, 1409 IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, kOsCrOS,
1410 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)}, 1410 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)},
1411 #if BUILDFLAG(ENABLE_EXTENSIONS) 1411 #if BUILDFLAG(ENABLE_EXTENSIONS)
1412 {"enable-embedded-extension-options", 1412 {"enable-embedded-extension-options",
1413 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_NAME, 1413 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_NAME,
1414 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, kOsDesktop, 1414 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, kOsDesktop,
1415 SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions)}, 1415 SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions)},
1416 #endif // ENABLE_EXTENSIONS 1416 #endif // ENABLE_EXTENSIONS
1417 #if defined(USE_ASH)
1418 {"enable-web-app-frame", IDS_FLAGS_WEB_APP_FRAME_NAME,
1419 IDS_FLAGS_WEB_APP_FRAME_DESCRIPTION, kOsWin | kOsCrOS,
1420 SINGLE_VALUE_TYPE(switches::kEnableWebAppFrame)},
1421 #endif // USE_ASH
1422 {"drop-sync-credential", IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME, 1417 {"drop-sync-credential", IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME,
1423 IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, kOsAll, 1418 IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, kOsAll,
1424 FEATURE_VALUE_TYPE(password_manager::features::kDropSyncCredential)}, 1419 FEATURE_VALUE_TYPE(password_manager::features::kDropSyncCredential)},
1425 #if BUILDFLAG(ENABLE_EXTENSIONS) 1420 #if BUILDFLAG(ENABLE_EXTENSIONS)
1426 {"enable-extension-action-redesign", 1421 {"enable-extension-action-redesign",
1427 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME, 1422 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME,
1428 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, kOsDesktop, 1423 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, kOsDesktop,
1429 SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)}, 1424 SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)},
1430 #endif // ENABLE_EXTENSIONS 1425 #endif // ENABLE_EXTENSIONS
1431 #if !defined(OS_ANDROID) 1426 #if !defined(OS_ANDROID)
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after
2346 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2341 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2347 2342
2348 const FeatureEntry* GetFeatureEntries(size_t* count) { 2343 const FeatureEntry* GetFeatureEntries(size_t* count) {
2349 *count = arraysize(kFeatureEntries); 2344 *count = arraysize(kFeatureEntries);
2350 return kFeatureEntries; 2345 return kFeatureEntries;
2351 } 2346 }
2352 2347
2353 } // namespace testing 2348 } // namespace testing
2354 2349
2355 } // namespace about_flags 2350 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698