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

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

Issue 1412863004: arc-bridge: Add the ARC Bridge Service (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Addressed feedback and fixed failing tests Created 5 years, 1 month 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 2114 matching lines...) Expand 10 before | Expand all | Expand 10 after
2125 switches::kDisableAppContainer)}, 2125 switches::kDisableAppContainer)},
2126 #endif // defined(OS_WIN) 2126 #endif // defined(OS_WIN)
2127 #if defined(OS_ANDROID) 2127 #if defined(OS_ANDROID)
2128 {"disable-auto-hiding-toolbar-threshold", 2128 {"disable-auto-hiding-toolbar-threshold",
2129 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_NAME, 2129 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_NAME,
2130 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION, 2130 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION,
2131 kOsAndroid, 2131 kOsAndroid,
2132 SINGLE_VALUE_TYPE_AND_VALUE(switches::kDisableAutoHidingToolbarThreshold, 2132 SINGLE_VALUE_TYPE_AND_VALUE(switches::kDisableAutoHidingToolbarThreshold,
2133 "0")}, 2133 "0")},
2134 #endif 2134 #endif
2135 #if defined(OS_CHROMEOS)
2136 {"enable-arc",
2137 IDS_FLAGS_ENABLE_ARC_NAME,
2138 IDS_FLAGS_ENABLE_ARC_DESCRIPTION,
2139 kOsCrOS,
2140 SINGLE_VALUE_TYPE(chromeos::switches::kEnableArc)},
2141 #endif // defined(OS_CHROMEOS)
2135 // NOTE: Adding new command-line switches requires adding corresponding 2142 // NOTE: Adding new command-line switches requires adding corresponding
2136 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2143 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2137 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2144 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2138 }; 2145 };
2139 2146
2140 // Stores and encapsulates the little state that about:flags has. 2147 // Stores and encapsulates the little state that about:flags has.
2141 class FlagsState { 2148 class FlagsState {
2142 public: 2149 public:
2143 FlagsState() 2150 FlagsState()
2144 : feature_entries(kFeatureEntries), 2151 : feature_entries(kFeatureEntries),
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
2973 FlagsState::GetInstance()->SetFeatureEntries(entries, count); 2980 FlagsState::GetInstance()->SetFeatureEntries(entries, count);
2974 } 2981 }
2975 2982
2976 const FeatureEntry* GetFeatureEntries(size_t* count) { 2983 const FeatureEntry* GetFeatureEntries(size_t* count) {
2977 return FlagsState::GetInstance()->GetFeatureEntries(count); 2984 return FlagsState::GetInstance()->GetFeatureEntries(count);
2978 } 2985 }
2979 2986
2980 } // namespace testing 2987 } // namespace testing
2981 2988
2982 } // namespace about_flags 2989 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698