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

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

Issue 171423005: Added in-session captive portal notification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Deleted useless NotificaionDisplayed(). Created 6 years, 10 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 | Annotate | Revision Log
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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 }, 1005 },
1006 { 1006 {
1007 "ash-enable-immersive-fullscreen-all-windows2", 1007 "ash-enable-immersive-fullscreen-all-windows2",
1008 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, 1008 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME,
1009 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, 1009 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION,
1010 kOsCrOS, 1010 kOsCrOS,
1011 ENABLE_DISABLE_VALUE_TYPE( 1011 ENABLE_DISABLE_VALUE_TYPE(
1012 ash::switches::kAshEnableImmersiveFullscreenForAllWindows, 1012 ash::switches::kAshEnableImmersiveFullscreenForAllWindows,
1013 ash::switches::kAshEnableImmersiveFullscreenForBrowserOnly) 1013 ash::switches::kAshEnableImmersiveFullscreenForBrowserOnly)
1014 }, 1014 },
1015 {
1016 "network-portal-notification",
1017 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME,
1018 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION,
1019 kOsCrOS,
1020 ENABLE_DISABLE_VALUE_TYPE(
1021 chromeos::switches::kEnableNetworkPortalNotification,
1022 chromeos::switches::kDisableNetworkPortalNotification)
1023 },
1015 #endif 1024 #endif
1016 { 1025 {
1017 "enable-download-resumption", 1026 "enable-download-resumption",
1018 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, 1027 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME,
1019 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, 1028 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION,
1020 kOsDesktop, 1029 kOsDesktop,
1021 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) 1030 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption)
1022 }, 1031 },
1023 { 1032 {
1024 "allow-nacl-socket-api", 1033 "allow-nacl-socket-api",
(...skipping 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after
2461 } 2470 }
2462 2471
2463 const Experiment* GetExperiments(size_t* count) { 2472 const Experiment* GetExperiments(size_t* count) {
2464 *count = num_experiments; 2473 *count = num_experiments;
2465 return experiments; 2474 return experiments;
2466 } 2475 }
2467 2476
2468 } // namespace testing 2477 } // namespace testing
2469 2478
2470 } // namespace about_flags 2479 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/net/network_portal_detector_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698