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

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

Issue 2552903003: Remove unreleased web app frame code from ChromeOS (Closed)
Patch Set: 'nother bit 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 1365 matching lines...) Expand 10 before | Expand all | Expand 10 after
1376 #endif // OS_ANDROID 1376 #endif // OS_ANDROID
1377 {"enable-hotword-hardware", IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_NAME, 1377 {"enable-hotword-hardware", IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_NAME,
1378 IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, kOsCrOS, 1378 IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, kOsCrOS,
1379 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)}, 1379 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)},
1380 #if BUILDFLAG(ENABLE_EXTENSIONS) 1380 #if BUILDFLAG(ENABLE_EXTENSIONS)
1381 {"enable-embedded-extension-options", 1381 {"enable-embedded-extension-options",
1382 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_NAME, 1382 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_NAME,
1383 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, kOsDesktop, 1383 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, kOsDesktop,
1384 SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions)}, 1384 SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions)},
1385 #endif // ENABLE_EXTENSIONS 1385 #endif // ENABLE_EXTENSIONS
1386 #if defined(USE_ASH)
1387 {"enable-web-app-frame", IDS_FLAGS_WEB_APP_FRAME_NAME,
1388 IDS_FLAGS_WEB_APP_FRAME_DESCRIPTION, kOsWin | kOsCrOS,
1389 SINGLE_VALUE_TYPE(switches::kEnableWebAppFrame)},
1390 #endif // USE_ASH
1391 {"drop-sync-credential", IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME, 1386 {"drop-sync-credential", IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME,
1392 IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, kOsAll, 1387 IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, kOsAll,
1393 FEATURE_VALUE_TYPE(password_manager::features::kDropSyncCredential)}, 1388 FEATURE_VALUE_TYPE(password_manager::features::kDropSyncCredential)},
1394 #if BUILDFLAG(ENABLE_EXTENSIONS) 1389 #if BUILDFLAG(ENABLE_EXTENSIONS)
1395 {"enable-extension-action-redesign", 1390 {"enable-extension-action-redesign",
1396 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME, 1391 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME,
1397 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, kOsDesktop, 1392 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, kOsDesktop,
1398 SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)}, 1393 SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)},
1399 #endif // ENABLE_EXTENSIONS 1394 #endif // ENABLE_EXTENSIONS
1400 #if !defined(OS_ANDROID) 1395 #if !defined(OS_ANDROID)
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after
2300 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2295 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2301 2296
2302 const FeatureEntry* GetFeatureEntries(size_t* count) { 2297 const FeatureEntry* GetFeatureEntries(size_t* count) {
2303 *count = arraysize(kFeatureEntries); 2298 *count = arraysize(kFeatureEntries);
2304 return kFeatureEntries; 2299 return kFeatureEntries;
2305 } 2300 }
2306 2301
2307 } // namespace testing 2302 } // namespace testing
2308 2303
2309 } // namespace about_flags 2304 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698