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

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

Issue 12463015: Enable <adview> tag for packaged apps. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Merge fix. Created 7 years, 9 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('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 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 SINGLE_VALUE_TYPE(switches::kEnablePnacl) 460 SINGLE_VALUE_TYPE(switches::kEnablePnacl)
461 }, 461 },
462 { 462 {
463 "extension-apis", // FLAGS:RECORD_UMA 463 "extension-apis", // FLAGS:RECORD_UMA
464 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, 464 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,
465 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, 465 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION,
466 kOsDesktop, 466 kOsDesktop,
467 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis) 467 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis)
468 }, 468 },
469 { 469 {
470 "enable-adview",
471 IDS_FLAGS_ENABLE_ADVIEW_NAME,
472 IDS_FLAGS_ENABLE_ADVIEW_DESCRIPTION,
473 kOsDesktop,
474 SINGLE_VALUE_TYPE(switches::kEnableAdview)
475 },
476 {
477 "enable-adview-src-attribute",
478 IDS_FLAGS_ENABLE_ADVIEW_SRC_ATTRIBUTE_NAME,
479 IDS_FLAGS_ENABLE_ADVIEW_SRC_ATTRIBUTE_DESCRIPTION,
480 kOsDesktop,
481 SINGLE_VALUE_TYPE(switches::kEnableAdviewSrcAttribute)
482 },
483 {
470 "action-box", 484 "action-box",
471 IDS_FLAGS_ACTION_BOX_NAME, 485 IDS_FLAGS_ACTION_BOX_NAME,
472 IDS_FLAGS_ACTION_BOX_DESCRIPTION, 486 IDS_FLAGS_ACTION_BOX_DESCRIPTION,
473 kOsDesktop, 487 kOsDesktop,
474 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kActionBox, "1", 488 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kActionBox, "1",
475 switches::kActionBox, "0") 489 switches::kActionBox, "0")
476 }, 490 },
477 { 491 {
478 "script-badges", 492 "script-badges",
479 IDS_FLAGS_SCRIPT_BADGES_NAME, 493 IDS_FLAGS_SCRIPT_BADGES_NAME,
(...skipping 1250 matching lines...) Expand 10 before | Expand all | Expand 10 after
1730 } 1744 }
1731 1745
1732 const Experiment* GetExperiments(size_t* count) { 1746 const Experiment* GetExperiments(size_t* count) {
1733 *count = num_experiments; 1747 *count = num_experiments;
1734 return experiments; 1748 return experiments;
1735 } 1749 }
1736 1750
1737 } // namespace testing 1751 } // namespace testing
1738 1752
1739 } // namespace about_flags 1753 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698