Added in-session captive portal notification.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 329 matching lines @@
     switches::kEnableZeroSuggestMostVisited, ""},
   { IDS_FLAGS_ZERO_SUGGEST_ETHER_SERP,
     switches::kEnableZeroSuggestEtherSerp, ""},
   { IDS_FLAGS_ZERO_SUGGEST_ETHER_NO_SERP,
     switches::kEnableZeroSuggestEtherNoSerp, ""},
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
     switches::kDisableZeroSuggest, ""}
 };
 #endif
 
+

[oshima, 2014/02/20 19:00:54]

nit: remove extra line

[ygorshenin1, 2014/02/20 19:18:45]

Done.

 const Experiment::Choice kNumRasterThreadsChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_FLAGS_NUM_RASTER_THREADS_ONE, switches::kNumRasterThreads, "1" },
   { IDS_FLAGS_NUM_RASTER_THREADS_TWO, switches::kNumRasterThreads, "2" },
   { IDS_FLAGS_NUM_RASTER_THREADS_THREE, switches::kNumRasterThreads, "3" },
   { IDS_FLAGS_NUM_RASTER_THREADS_FOUR, switches::kNumRasterThreads, "4" }
 };
 
 // We're using independent flags here (as opposed to a common flag with
 // different values) to be able to enable/disable the entire experience
@@ skipping 671 matching lines @@
   },
   {
     "ash-enable-immersive-fullscreen-all-windows2",
     IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME,
     IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION,
     kOsCrOS,
     ENABLE_DISABLE_VALUE_TYPE(
         ash::switches::kAshEnableImmersiveFullscreenForAllWindows,
         ash::switches::kAshEnableImmersiveFullscreenForBrowserOnly)
   },
+  {
+    "network-portal-notification",
+    IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME,
+    IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION,
+    kOsCrOS,
+    ENABLE_DISABLE_VALUE_TYPE(
+        chromeos::switches::kEnableNetworkPortalNotification,
+        chromeos::switches::kDisableNetworkPortalNotification)
+  },
 #endif
   {
     "enable-download-resumption",
     IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME,
     IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION,
     kOsDesktop,
     SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption)
   },
   {
     "allow-nacl-socket-api",
@@ skipping 1462 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags