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

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

Issue 637463002: Revert "Remote Assistance on Chrome OS Part III - NativeMessageHost" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 1943 matching lines...) Expand 10 before | Expand all | Expand 10 after
1954 }, 1954 },
1955 #if defined(ENABLE_PLUGINS) 1955 #if defined(ENABLE_PLUGINS)
1956 { 1956 {
1957 "enable-plugin-power-saver", 1957 "enable-plugin-power-saver",
1958 IDS_FLAGS_ENABLE_PLUGIN_POWER_SAVER_NAME, 1958 IDS_FLAGS_ENABLE_PLUGIN_POWER_SAVER_NAME,
1959 IDS_FLAGS_ENABLE_PLUGIN_POWER_SAVER_DESCRIPTION, 1959 IDS_FLAGS_ENABLE_PLUGIN_POWER_SAVER_DESCRIPTION,
1960 kOsDesktop, 1960 kOsDesktop,
1961 SINGLE_VALUE_TYPE(switches::kEnablePluginPowerSaver) 1961 SINGLE_VALUE_TYPE(switches::kEnablePluginPowerSaver)
1962 }, 1962 },
1963 #endif 1963 #endif
1964 #if defined(OS_CHROMEOS) 1964
1965 {
1966 "enable-remote-assistance",
1967 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_NAME,
1968 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_DESCRIPTION,
1969 kOsCrOS,
1970 SINGLE_VALUE_TYPE(extensions::switches::kEnableRemoteAssistance)
1971 },
1972 #endif // defined(OS_CHROMEOS)
1973 // NOTE: Adding new command-line switches requires adding corresponding 1965 // NOTE: Adding new command-line switches requires adding corresponding
1974 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 1966 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1975 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 1967 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
1976 }; 1968 };
1977 1969
1978 const Experiment* experiments = kExperiments; 1970 const Experiment* experiments = kExperiments;
1979 size_t num_experiments = arraysize(kExperiments); 1971 size_t num_experiments = arraysize(kExperiments);
1980 1972
1981 // Stores and encapsulates the little state that about:flags has. 1973 // Stores and encapsulates the little state that about:flags has.
1982 class FlagsState { 1974 class FlagsState {
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
2559 } 2551 }
2560 2552
2561 const Experiment* GetExperiments(size_t* count) { 2553 const Experiment* GetExperiments(size_t* count) {
2562 *count = num_experiments; 2554 *count = num_experiments;
2563 return experiments; 2555 return experiments;
2564 } 2556 }
2565 2557
2566 } // namespace testing 2558 } // namespace testing
2567 2559
2568 } // namespace about_flags 2560 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/api/messaging/message_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698