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

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

Issue 2552903003: Remove unreleased web app frame code from ChromeOS (Closed)
Patch Set: 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 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 #endif // OS_ANDROID 1377 #endif // OS_ANDROID
1378 {"enable-hotword-hardware", IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_NAME, 1378 {"enable-hotword-hardware", IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_NAME,
1379 IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, kOsCrOS, 1379 IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, kOsCrOS,
1380 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)}, 1380 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)},
1381 #if BUILDFLAG(ENABLE_EXTENSIONS) 1381 #if BUILDFLAG(ENABLE_EXTENSIONS)
1382 {"enable-embedded-extension-options", 1382 {"enable-embedded-extension-options",
1383 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_NAME, 1383 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_NAME,
1384 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, kOsDesktop, 1384 IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, kOsDesktop,
1385 SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions)}, 1385 SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions)},
1386 #endif // ENABLE_EXTENSIONS 1386 #endif // ENABLE_EXTENSIONS
1387 #if defined(USE_ASH)
1388 {"enable-web-app-frame", IDS_FLAGS_WEB_APP_FRAME_NAME,
1389 IDS_FLAGS_WEB_APP_FRAME_DESCRIPTION, kOsWin | kOsCrOS,
1390 SINGLE_VALUE_TYPE(switches::kEnableWebAppFrame)},
1391 #endif // USE_ASH
1392 {"drop-sync-credential", IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME, 1387 {"drop-sync-credential", IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME,
1393 IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, kOsAll, 1388 IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, kOsAll,
1394 FEATURE_VALUE_TYPE(password_manager::features::kDropSyncCredential)}, 1389 FEATURE_VALUE_TYPE(password_manager::features::kDropSyncCredential)},
1395 #if BUILDFLAG(ENABLE_EXTENSIONS) 1390 #if BUILDFLAG(ENABLE_EXTENSIONS)
1396 {"enable-extension-action-redesign", 1391 {"enable-extension-action-redesign",
1397 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME, 1392 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME,
1398 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, kOsDesktop, 1393 IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, kOsDesktop,
1399 SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)}, 1394 SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)},
1400 #endif // ENABLE_EXTENSIONS 1395 #endif // ENABLE_EXTENSIONS
1401 #if !defined(OS_ANDROID) 1396 #if !defined(OS_ANDROID)
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
2311 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2306 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2312 2307
2313 const FeatureEntry* GetFeatureEntries(size_t* count) { 2308 const FeatureEntry* GetFeatureEntries(size_t* count) {
2314 *count = arraysize(kFeatureEntries); 2309 *count = arraysize(kFeatureEntries);
2315 return kFeatureEntries; 2310 return kFeatureEntries;
2316 } 2311 }
2317 2312
2318 } // namespace testing 2313 } // namespace testing
2319 2314
2320 } // namespace about_flags 2315 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/BUILD.gn » ('j') | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698