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

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

Issue 16191003: Add enable-app-shims to chrome://flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update comment in apps_page.js Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/ntp4/apps_page.js » ('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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1446 matching lines...) Expand 10 before | Expand all | Expand 10 after
1457 SINGLE_VALUE_TYPE(switches::kEnableResetProfileSettings) 1457 SINGLE_VALUE_TYPE(switches::kEnableResetProfileSettings)
1458 }, 1458 },
1459 #if defined(OS_MACOSX) 1459 #if defined(OS_MACOSX)
1460 { 1460 {
1461 "enable-app-list-shim", 1461 "enable-app-list-shim",
1462 IDS_FLAGS_ENABLE_APP_LIST_SHIM_NAME, 1462 IDS_FLAGS_ENABLE_APP_LIST_SHIM_NAME,
1463 IDS_FLAGS_ENABLE_APP_LIST_SHIM_DESCRIPTION, 1463 IDS_FLAGS_ENABLE_APP_LIST_SHIM_DESCRIPTION,
1464 kOsMac, 1464 kOsMac,
1465 SINGLE_VALUE_TYPE(switches::kEnableAppListShim) 1465 SINGLE_VALUE_TYPE(switches::kEnableAppListShim)
1466 }, 1466 },
1467 {
1468 "enable-app-shims",
1469 IDS_FLAGS_ENABLE_APP_SHIMS_NAME,
1470 IDS_FLAGS_ENABLE_APP_SHIMS_DESCRIPTION,
1471 kOsMac,
1472 SINGLE_VALUE_TYPE(switches::kEnableAppShims)
1473 },
1467 #endif 1474 #endif
1468 }; 1475 };
1469 1476
1470 const Experiment* experiments = kExperiments; 1477 const Experiment* experiments = kExperiments;
1471 size_t num_experiments = arraysize(kExperiments); 1478 size_t num_experiments = arraysize(kExperiments);
1472 1479
1473 // Stores and encapsulates the little state that about:flags has. 1480 // Stores and encapsulates the little state that about:flags has.
1474 class FlagsState { 1481 class FlagsState {
1475 public: 1482 public:
1476 FlagsState() : needs_restart_(false) {} 1483 FlagsState() : needs_restart_(false) {}
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 } 1969 }
1963 1970
1964 const Experiment* GetExperiments(size_t* count) { 1971 const Experiment* GetExperiments(size_t* count) {
1965 *count = num_experiments; 1972 *count = num_experiments;
1966 return experiments; 1973 return experiments;
1967 } 1974 }
1968 1975
1969 } // namespace testing 1976 } // namespace testing
1970 1977
1971 } // namespace about_flags 1978 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/ntp4/apps_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698