Update "Predict network actions" UI setting.

chrome/browser/ui/webui/options/browser_options_handler.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/ui/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "apps/app_window.h"
@@ skipping 14 matching lines @@
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/auto_launch_trial.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/gpu/gpu_mode_manager.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/profile_resetter/automatic_profile_resetter.h"
 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
@@ skipping 788 matching lines @@
   auto_open_files_.Init(
       prefs::kDownloadExtensionsToOpen, prefs,
       base::Bind(&BrowserOptionsHandler::SetupAutoOpenFileTypes,
                  base::Unretained(this)));
   default_zoom_level_.Init(
       prefs::kDefaultZoomLevel, prefs,
       base::Bind(&BrowserOptionsHandler::SetupPageZoomSelector,
                  base::Unretained(this)));
   profile_pref_registrar_.Init(prefs);
   profile_pref_registrar_.Add(
+      prefs::kNetworkPredictionOptions,
+      base::Bind(&BrowserOptionsHandler::SetupNetworkPredictionControl,
+                 base::Unretained(this)));
+  profile_pref_registrar_.Add(
       prefs::kWebKitDefaultFontSize,
       base::Bind(&BrowserOptionsHandler::SetupFontSizeSelector,
                  base::Unretained(this)));
   profile_pref_registrar_.Add(
       prefs::kWebKitDefaultFixedFontSize,
       base::Bind(&BrowserOptionsHandler::SetupFontSizeSelector,
                  base::Unretained(this)));
   profile_pref_registrar_.Add(
       prefs::kSupervisedUsers,
       base::Bind(&BrowserOptionsHandler::SetupManagingSupervisedUsers,
@@ skipping 43 matching lines @@
 
 void BrowserOptionsHandler::InitializePage() {
   page_initialized_ = true;
 
   OnTemplateURLServiceChanged();
 
   ObserveThemeChanged();
   OnStateChanged();
   UpdateDefaultBrowserState();
 
+  MigrateNetworkPredictionOptions();
+
   SetupMetricsReportingSettingVisibility();
+  SetupNetworkPredictionControl();
   SetupFontSizeSelector();
   SetupPageZoomSelector();
   SetupAutoOpenFileTypes();
   SetupProxySettingsSection();
   SetupManageCertificatesSection();
   SetupManagingSupervisedUsers();
   SetupEasyUnlock();
   SetupExtensionControlledIndicators();
 
 #if defined(OS_CHROMEOS)
@@ skipping 725 matching lines @@
 void BrowserOptionsHandler::SetupAccessibilityFeatures() {
   PrefService* pref_service = g_browser_process->local_state();
   base::FundamentalValue virtual_keyboard_enabled(
       pref_service->GetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled));
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setVirtualKeyboardCheckboxState",
       virtual_keyboard_enabled);
 }
 #endif
 
+void BrowserOptionsHandler::MigrateNetworkPredictionOptions() {
+  PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
+  if (pref_service->GetInteger(prefs::kNetworkPredictionOptions) ==
+          chrome_browser_net::NETWORK_PREDICTION_UNSET &&
+      pref_service->FindPreference(prefs::kNetworkPredictionEnabled) &&
+      pref_service->FindPreference(prefs::kNetworkPredictionEnabled)

[stevenjb, 2014/08/05 15:51:56]

nit: Use a local to avoid extra lookup. Also maybe use early exits to simplify
code, e.g. if (..GetInteger... != UNSET) return;

[Bence, 2014/08/06 19:38:16]

Done.

+          ->HasUserSetting()) {
+    pref_service->SetInteger(
+        prefs::kNetworkPredictionOptions,
+        pref_service->GetBoolean(prefs::kNetworkPredictionEnabled)
+            ? chrome_browser_net::NETWORK_PREDICTION_WIFI_ONLY
+            : chrome_browser_net::NETWORK_PREDICTION_NEVER);
+  }
+}
+
 void BrowserOptionsHandler::SetupMetricsReportingSettingVisibility() {
 #if defined(GOOGLE_CHROME_BUILD)
   // Don't show the reporting setting if we are in the guest mode.
   if (Profile::FromWebUI(web_ui())->IsGuestSession()) {
     base::FundamentalValue visible(false);
     web_ui()->CallJavascriptFunction(
         "BrowserOptions.setMetricsReportingSettingVisibility", visible);
   }
 #endif
 }
 
+void BrowserOptionsHandler::SetupNetworkPredictionControl() {
+  PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
+  const PrefService::Preference* network_prediction_options =
+      pref_service->FindPreference(prefs::kNetworkPredictionOptions);
+
+  base::DictionaryValue dict;
+  dict.SetInteger("value",
+                  pref_service->GetInteger(prefs::kNetworkPredictionOptions));

[stevenjb, 2014/08/05 15:51:56]

Use network_prediction_options->GetValue()->GetAsInteger() instead of doing an
extra lookup here.

[Bence, 2014/08/06 19:38:16]

Done.

+  dict.SetBoolean("disabled", !network_prediction_options->IsUserModifiable());
+
+  web_ui()->CallJavascriptFunction("BrowserOptions.setNetworkPredictionValue",
+                                   dict);
+}
+
 void BrowserOptionsHandler::SetupFontSizeSelector() {
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
   const PrefService::Preference* default_font_size =
       pref_service->FindPreference(prefs::kWebKitDefaultFontSize);
   const PrefService::Preference* default_fixed_font_size =
       pref_service->FindPreference(prefs::kWebKitDefaultFixedFontSize);
 
   base::DictionaryValue dict;
   dict.SetInteger("value",
                   pref_service->GetInteger(prefs::kWebKitDefaultFontSize));
@@ skipping 168 matching lines @@
   extension = extensions::GetExtensionOverridingProxy(
       Profile::FromWebUI(web_ui()));
   AppendExtensionData("proxy", extension, &extension_controlled);
 
   web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
                                    extension_controlled);
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace options