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

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

Issue 1167883002: [Mac] Include MacViews native app windows in regular builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@drag_event
Patch Set: Sync and rebase Created 5 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
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 2388 matching lines...) Expand 10 before | Expand all | Expand 10 after
2399 #endif 2399 #endif
2400 #if defined(OS_MACOSX) 2400 #if defined(OS_MACOSX)
2401 { 2401 {
2402 "app-info-dialog", 2402 "app-info-dialog",
2403 IDS_FLAGS_APP_INFO_DIALOG_NAME, 2403 IDS_FLAGS_APP_INFO_DIALOG_NAME,
2404 IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION, 2404 IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION,
2405 kOsMac, 2405 kOsMac,
2406 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac, 2406 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac,
2407 switches::kDisableAppInfoDialogMac) 2407 switches::kDisableAppInfoDialogMac)
2408 }, 2408 },
2409 {
2410 "mac-views-native-app-windows",
2411 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME,
2412 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION,
2413 kOsMac,
2414 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows,
2415 switches::kDisableMacViewsNativeAppWindows)
2416 },
2409 #endif 2417 #endif
2410 // NOTE: Adding new command-line switches requires adding corresponding 2418 // NOTE: Adding new command-line switches requires adding corresponding
2411 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2419 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2412 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2420 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2413 }; 2421 };
2414 2422
2415 const Experiment* experiments = kExperiments; 2423 const Experiment* experiments = kExperiments;
2416 size_t num_experiments = arraysize(kExperiments); 2424 size_t num_experiments = arraysize(kExperiments);
2417 2425
2418 // Stores and encapsulates the little state that about:flags has. 2426 // Stores and encapsulates the little state that about:flags has.
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
2997 } 3005 }
2998 3006
2999 const Experiment* GetExperiments(size_t* count) { 3007 const Experiment* GetExperiments(size_t* count) {
3000 *count = num_experiments; 3008 *count = num_experiments;
3001 return experiments; 3009 return experiments;
3002 } 3010 }
3003 3011
3004 } // namespace testing 3012 } // namespace testing
3005 3013
3006 } // namespace about_flags 3014 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698