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

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

Issue 19678004: Move UserScript and Extension switches to top-level extensions/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 5 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 | « no previous file | 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>
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/memory/singleton.h" 14 #include "base/memory/singleton.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "cc/base/switches.h" 18 #include "cc/base/switches.h"
19 #include "chrome/browser/flags_storage.h" 19 #include "chrome/browser/flags_storage.h"
20 #include "chrome/common/chrome_content_client.h" 20 #include "chrome/common/chrome_content_client.h"
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "components/nacl/common/nacl_switches.h" 22 #include "components/nacl/common/nacl_switches.h"
23 #include "content/public/browser/user_metrics.h" 23 #include "content/public/browser/user_metrics.h"
24 #include "extensions/common/switches.h"
24 #include "grit/chromium_strings.h" 25 #include "grit/chromium_strings.h"
25 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
26 #include "grit/google_chrome_strings.h" 27 #include "grit/google_chrome_strings.h"
27 #include "media/base/media_switches.h" 28 #include "media/base/media_switches.h"
28 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/base/ui_base_switches.h" 30 #include "ui/base/ui_base_switches.h"
30 #include "ui/gfx/switches.h" 31 #include "ui/gfx/switches.h"
31 #include "ui/gl/gl_switches.h" 32 #include "ui/gl/gl_switches.h"
32 #include "ui/keyboard/keyboard_switches.h" 33 #include "ui/keyboard/keyboard_switches.h"
33 #include "ui/message_center/message_center_switches.h" 34 #include "ui/message_center/message_center_switches.h"
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, 539 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,
539 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, 540 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION,
540 kOsDesktop, 541 kOsDesktop,
541 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis) 542 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis)
542 }, 543 },
543 { 544 {
544 "extensions-on-chrome-urls", 545 "extensions-on-chrome-urls",
545 IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME, 546 IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME,
546 IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_DESCRIPTION, 547 IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_DESCRIPTION,
547 kOsAll, 548 kOsAll,
548 SINGLE_VALUE_TYPE(switches::kExtensionsOnChromeURLs) 549 SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)
549 }, 550 },
550 { 551 {
551 "enable-fast-unload", 552 "enable-fast-unload",
552 IDS_FLAGS_ENABLE_FAST_UNLOAD_NAME, 553 IDS_FLAGS_ENABLE_FAST_UNLOAD_NAME,
553 IDS_FLAGS_ENABLE_FAST_UNLOAD_DESCRIPTION, 554 IDS_FLAGS_ENABLE_FAST_UNLOAD_DESCRIPTION,
554 kOsAll, 555 kOsAll,
555 SINGLE_VALUE_TYPE(switches::kEnableFastUnload) 556 SINGLE_VALUE_TYPE(switches::kEnableFastUnload)
556 }, 557 },
557 { 558 {
558 "enable-adview", 559 "enable-adview",
(...skipping 1548 matching lines...) Expand 10 before | Expand all | Expand 10 after
2107 } 2108 }
2108 2109
2109 const Experiment* GetExperiments(size_t* count) { 2110 const Experiment* GetExperiments(size_t* count) {
2110 *count = num_experiments; 2111 *count = num_experiments;
2111 return experiments; 2112 return experiments;
2112 } 2113 }
2113 2114
2114 } // namespace testing 2115 } // namespace testing
2115 2116
2116 } // namespace about_flags 2117 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698