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

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

Issue 512543002: Model <webview> and <appview> script injection after <extensionoptions> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add permission dependency to whitelist Created 6 years, 3 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
« no previous file with comments | « no previous file | chrome/common/extensions/api/_api_features.json » ('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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 1459 matching lines...) Expand 10 before | Expand all | Expand 10 after
1470 IDS_FLAGS_ENABLE_APP_LIST_NAME, 1470 IDS_FLAGS_ENABLE_APP_LIST_NAME,
1471 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, 1471 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION,
1472 kOsLinux, 1472 kOsLinux,
1473 SINGLE_VALUE_TYPE(switches::kEnableAppList) 1473 SINGLE_VALUE_TYPE(switches::kEnableAppList)
1474 }, 1474 },
1475 #endif 1475 #endif
1476 { 1476 {
1477 "enable-app-view", 1477 "enable-app-view",
1478 IDS_FLAGS_ENABLE_APP_VIEW_NAME, 1478 IDS_FLAGS_ENABLE_APP_VIEW_NAME,
1479 IDS_FLAGS_ENABLE_APP_VIEW_DESCRIPTION, 1479 IDS_FLAGS_ENABLE_APP_VIEW_DESCRIPTION,
1480 kOsAll, 1480 kOsDesktop,
1481 SINGLE_VALUE_TYPE(extensions::switches::kEnableAppView) 1481 SINGLE_VALUE_TYPE(extensions::switches::kEnableAppView)
1482 }, 1482 },
1483 { 1483 {
1484 "disable-app-list-app-info", 1484 "disable-app-list-app-info",
1485 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST, 1485 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST,
1486 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, 1486 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION,
1487 kOsLinux | kOsWin | kOsCrOS, 1487 kOsLinux | kOsWin | kOsCrOS,
1488 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) 1488 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo)
1489 }, 1489 },
1490 { 1490 {
(...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after
2491 } 2491 }
2492 2492
2493 const Experiment* GetExperiments(size_t* count) { 2493 const Experiment* GetExperiments(size_t* count) {
2494 *count = num_experiments; 2494 *count = num_experiments;
2495 return experiments; 2495 return experiments;
2496 } 2496 }
2497 2497
2498 } // namespace testing 2498 } // namespace testing
2499 2499
2500 } // namespace about_flags 2500 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/common/extensions/api/_api_features.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698