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

Side by Side Diff: chrome/common/pref_names.cc

Issue 789353004: Host Chrome OS GAIA signin page in webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove changes from https://codereview.chromium.org/812513003 Created 5 years, 12 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/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 1902 matching lines...) Expand 10 before | Expand all | Expand 10 after
1913 // This is saved to file and cleared after chrome process starts. 1913 // This is saved to file and cleared after chrome process starts.
1914 const char kLogoutStartedLast[] = "chromeos.logout-started"; 1914 const char kLogoutStartedLast[] = "chromeos.logout-started";
1915 1915
1916 // An integer pref of the current consumer management stage. The meaning of the 1916 // An integer pref of the current consumer management stage. The meaning of the
1917 // value is defined in: 1917 // value is defined in:
1918 // chrome/browser/chromeos/policy/consumer_management_stage.h 1918 // chrome/browser/chromeos/policy/consumer_management_stage.h
1919 const char kConsumerManagementStage[] = "consumer_management.stage"; 1919 const char kConsumerManagementStage[] = "consumer_management.stage";
1920 1920
1921 // A boolean pref. If set to true, new experimental OOBE UI is displayed. 1921 // A boolean pref. If set to true, new experimental OOBE UI is displayed.
1922 const char kNewOobe[] = "NewOobe"; 1922 const char kNewOobe[] = "NewOobe";
1923
1924 // An integer pref of the current consumer management enrollment stage. The
1925 // meaning of the value is defined in the enum EnrollmentStage in:
1926 // chrome/browser/chromeos/policy/consumer_management_service.h
1927 const char kConsumerManagementEnrollmentStage[] =
1928 "consumer_management.enrollment_stage";
dzhioev (left Google) 2014/12/25 13:28:46 Is it a merge artifact?
Dmitry Polukhin 2014/12/25 15:53:55 Done. Thank you for finding it!
1929
1930 // A boolean pref. If set to true, experimental webview based signin flow
1931 // activated.
1932 extern const char kWebviewSigninEnabled[] =
1933 "webview_signin_enabled";
1923 #endif // defined(OS_CHROMEOS) 1934 #endif // defined(OS_CHROMEOS)
1924 1935
1925 // Whether there is a Flash version installed that supports clearing LSO data. 1936 // Whether there is a Flash version installed that supports clearing LSO data.
1926 const char kClearPluginLSODataEnabled[] = "browser.clear_lso_data_enabled"; 1937 const char kClearPluginLSODataEnabled[] = "browser.clear_lso_data_enabled";
1927 1938
1928 // Whether we should show Pepper Flash-specific settings. 1939 // Whether we should show Pepper Flash-specific settings.
1929 const char kPepperFlashSettingsEnabled[] = 1940 const char kPepperFlashSettingsEnabled[] =
1930 "browser.pepper_flash_settings_enabled"; 1941 "browser.pepper_flash_settings_enabled";
1931 1942
1932 // String which specifies where to store the disk cache. 1943 // String which specifies where to store the disk cache.
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
2274 const char kPasswordBubbleNopesCount[] = "password_bubble.nopes"; 2285 const char kPasswordBubbleNopesCount[] = "password_bubble.nopes";
2275 2286
2276 // Last user's interaction with the password bubble. 2287 // Last user's interaction with the password bubble.
2277 const char kPasswordBubbleLastInteractions[] = "password_bubble.interactions"; 2288 const char kPasswordBubbleLastInteractions[] = "password_bubble.interactions";
2278 2289
2279 // Boolean that indicates whether elevation is needed to recover Chrome upgrade. 2290 // Boolean that indicates whether elevation is needed to recover Chrome upgrade.
2280 const char kRecoveryComponentNeedsElevation[] = 2291 const char kRecoveryComponentNeedsElevation[] =
2281 "recovery_component.needs_elevation"; 2292 "recovery_component.needs_elevation";
2282 2293
2283 } // namespace prefs 2294 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698