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

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

Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test and formatted browser_options.html. Created 5 years, 11 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 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 // restore them after a reboot. 832 // restore them after a reboot.
833 const char kFileSystemProviderMounted[] = "file_system_provider.mounted"; 833 const char kFileSystemProviderMounted[] = "file_system_provider.mounted";
834 834
835 // A boolean pref set to true if the virtual keyboard should be enabled. 835 // A boolean pref set to true if the virtual keyboard should be enabled.
836 const char kTouchVirtualKeyboardEnabled[] = "ui.touch_virtual_keyboard_enabled"; 836 const char kTouchVirtualKeyboardEnabled[] = "ui.touch_virtual_keyboard_enabled";
837 837
838 // An integer pref that controls the wake on wifi features that should be 838 // An integer pref that controls the wake on wifi features that should be
839 // enabled. 839 // enabled.
840 const char kWakeOnWiFiEnabled[] = "settings.internet.wake_on_wifi"; 840 const char kWakeOnWiFiEnabled[] = "settings.internet.wake_on_wifi";
841 841
842 // This is policy CaptivePortalAuthenticationIgnoresProxy that allows to open
bartfab (slow) 2015/01/07 17:38:43 Nit: s/is/is the/
Alexander Alekseev 2015/01/12 18:41:10 Done.
843 // Captive Portal authentication page in a separate window under another
bartfab (slow) 2015/01/07 17:38:43 Nit: s/page/pages/
Alexander Alekseev 2015/01/12 18:41:09 Done.
844 // profile, which allows to bypass proxy for captive portal authentication.
bartfab (slow) 2015/01/07 17:38:43 What is this "another profile"? Some other user's
Alexander Alekseev 2015/01/12 18:41:10 Done.
845 const char kCaptivePortalAuthenticationIgnoresProxy[] =
846 "proxy.captive_portal_ignores_proxy";
842 #endif // defined(OS_CHROMEOS) 847 #endif // defined(OS_CHROMEOS)
843 848
844 // The disabled messages in IPC logging. 849 // The disabled messages in IPC logging.
845 const char kIpcDisabledMessages[] = "ipc_log_disabled_messages"; 850 const char kIpcDisabledMessages[] = "ipc_log_disabled_messages";
846 851
847 // A boolean pref set to true if a Home button to open the Home pages should be 852 // A boolean pref set to true if a Home button to open the Home pages should be
848 // visible on the toolbar. 853 // visible on the toolbar.
849 const char kShowHomeButton[] = "browser.show_home_button"; 854 const char kShowHomeButton[] = "browser.show_home_button";
850 855
851 // A string value which saves short list of recently user selected encodings 856 // A string value which saves short list of recently user selected encodings
(...skipping 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after
2303 const char kPasswordBubbleNopesCount[] = "password_bubble.nopes"; 2308 const char kPasswordBubbleNopesCount[] = "password_bubble.nopes";
2304 2309
2305 // Last user's interaction with the password bubble. 2310 // Last user's interaction with the password bubble.
2306 const char kPasswordBubbleLastInteractions[] = "password_bubble.interactions"; 2311 const char kPasswordBubbleLastInteractions[] = "password_bubble.interactions";
2307 2312
2308 // Boolean that indicates whether elevation is needed to recover Chrome upgrade. 2313 // Boolean that indicates whether elevation is needed to recover Chrome upgrade.
2309 const char kRecoveryComponentNeedsElevation[] = 2314 const char kRecoveryComponentNeedsElevation[] =
2310 "recovery_component.needs_elevation"; 2315 "recovery_component.needs_elevation";
2311 2316
2312 } // namespace prefs 2317 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698