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

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

Issue 1416313004: arc-bridge: Start ArcBridgeService on session start (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Moved all ARC-related initialization to ChromeShellDelegate 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 2119 matching lines...) Expand 10 before | Expand all | Expand 10 after
2130 kOsAndroid, 2130 kOsAndroid,
2131 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, 2131 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts,
2132 switches::kDisableWebNotificationCustomLayouts)}, 2132 switches::kDisableWebNotificationCustomLayouts)},
2133 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) 2133 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID)
2134 #if defined(OS_WIN) 2134 #if defined(OS_WIN)
2135 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, 2135 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME,
2136 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, 2136 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin,
2137 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, 2137 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer,
2138 switches::kDisableAppContainer)}, 2138 switches::kDisableAppContainer)},
2139 #endif // defined(OS_WIN) 2139 #endif // defined(OS_WIN)
2140 #if defined(OS_CHROMEOS)
2141 {"enable-arc",
2142 IDS_FLAGS_ENABLE_ARC_NAME,
2143 IDS_FLAGS_ENABLE_ARC_DESCRIPTION,
2144 kOsCrOS,
2145 SINGLE_VALUE_TYPE(chromeos::switches::kEnableArc)},
2146 #endif
2140 // NOTE: Adding new command-line switches requires adding corresponding 2147 // NOTE: Adding new command-line switches requires adding corresponding
2141 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2148 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2142 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2149 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2143 }; 2150 };
2144 2151
2145 // Stores and encapsulates the little state that about:flags has. 2152 // Stores and encapsulates the little state that about:flags has.
2146 class FlagsState { 2153 class FlagsState {
2147 public: 2154 public:
2148 FlagsState() 2155 FlagsState()
2149 : feature_entries(kFeatureEntries), 2156 : feature_entries(kFeatureEntries),
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
2978 FlagsState::GetInstance()->SetFeatureEntries(entries, count); 2985 FlagsState::GetInstance()->SetFeatureEntries(entries, count);
2979 } 2986 }
2980 2987
2981 const FeatureEntry* GetFeatureEntries(size_t* count) { 2988 const FeatureEntry* GetFeatureEntries(size_t* count) {
2982 return FlagsState::GetInstance()->GetFeatureEntries(count); 2989 return FlagsState::GetInstance()->GetFeatureEntries(count);
2983 } 2990 }
2984 2991
2985 } // namespace testing 2992 } // namespace testing
2986 2993
2987 } // namespace about_flags 2994 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698