more changes

chrome/browser/ui/webui/options/browser_options_handler.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
@@ skipping 233 matching lines @@
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;
   else if (state == ShellIntegration::STATE_UNKNOWN)
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;
   else
     return;  // Still processing.
 
   SetDefaultBrowserUIString(status_string_id);
 }
 
 void BrowserOptionsHandler::SetDefaultBrowserUIString(int status_string_id) {
-  scoped_ptr<Value> status_string(Value::CreateStringValue(
+  scoped_ptr<Value> status_string(base::StringValue::New(
       l10n_util::GetStringFUTF16(status_string_id,
                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))));
 
-  scoped_ptr<Value> is_default(Value::CreateBooleanValue(
+  scoped_ptr<Value> is_default(base::BooleanValue::New(
       status_string_id == IDS_OPTIONS_DEFAULTBROWSER_DEFAULT));
 
-  scoped_ptr<Value> can_be_default(Value::CreateBooleanValue(
+  scoped_ptr<Value> can_be_default(base::BooleanValue::New(
       !default_browser_policy_.IsManaged() &&
       (status_string_id == IDS_OPTIONS_DEFAULTBROWSER_DEFAULT ||
        status_string_id == IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT)));
 
   web_ui_->CallJavascriptFunction("BrowserOptions.updateDefaultBrowserState",
                                   *status_string, *is_default, *can_be_default);
 }
 
 void BrowserOptionsHandler::OnTemplateURLServiceChanged() {
   if (!template_url_service_ || !template_url_service_->loaded())
@@ skipping 11 matching lines @@
       continue;
 
     DictionaryValue* entry = new DictionaryValue();
     entry->SetString("name", model_urls[i]->short_name());
     entry->SetInteger("index", i);
     search_engines.Append(entry);
     if (model_urls[i] == default_url)
       default_index = i;
   }
 
-  scoped_ptr<Value> default_value(Value::CreateIntegerValue(default_index));
-  scoped_ptr<Value> default_managed(Value::CreateBooleanValue(
+  scoped_ptr<Value> default_value(base::NumberValue::New(default_index));
+  scoped_ptr<Value> default_managed(base::BooleanValue::New(
       template_url_service_->is_default_search_managed()));
 
   web_ui_->CallJavascriptFunction("BrowserOptions.updateSearchEngines",
                                   search_engines, *default_value,
                                   *default_managed);
 }
 
 void BrowserOptionsHandler::SetDefaultSearchEngine(const ListValue* args) {
   int selected_index = -1;
   if (!ExtractIntegerValue(args, &selected_index)) {
@@ skipping 17 matching lines @@
     template_url_service_->Load();
     template_url_service_->AddObserver(this);
     OnTemplateURLServiceChanged();
   }
 }
 
 void BrowserOptionsHandler::UpdateRestoreOnStartup() {
   Profile* profile = Profile::FromWebUI(web_ui_);
   const SessionStartupPref startup_pref =
       SessionStartupPref::GetStartupPref(profile->GetPrefs());
-  base::FundamentalValue restore_on_startup(startup_pref.type);
+  base::NumberValue restore_on_startup(startup_pref.type);
   web_ui_->CallJavascriptFunction("BrowserOptions.updateRestoreOnStartup",
                                   restore_on_startup);
 }
 
 void BrowserOptionsHandler::UpdateStartupPages() {
   Profile* profile = Profile::FromWebUI(web_ui_);
   const SessionStartupPref startup_pref =
       SessionStartupPref::GetStartupPref(profile->GetPrefs());
   startup_custom_pages_table_model_->SetURLs(startup_pref.urls);
 }
@@ skipping 176 matching lines @@
 
 void BrowserOptionsHandler::EnableInstant(const ListValue* args) {
   InstantController::Enable(Profile::FromWebUI(web_ui_));
 }
 
 void BrowserOptionsHandler::DisableInstant(const ListValue* args) {
   InstantController::Disable(Profile::FromWebUI(web_ui_));
 }
 
 void BrowserOptionsHandler::GetInstantFieldTrialStatus(const ListValue* args) {
-  base::FundamentalValue enabled(
+  base::BooleanValue enabled(
       InstantFieldTrial::IsExperimentGroup(Profile::FromWebUI(web_ui_)));
   web_ui_->CallJavascriptFunction("BrowserOptions.setInstantFieldTrialStatus",
                                   enabled);
 }
 
 void BrowserOptionsHandler::OnResultChanged(bool default_match_changed) {
   const AutocompleteResult& result = autocomplete_controller_->result();
   ListValue suggestions;
   for (size_t i = 0; i < result.size(); ++i) {
     const AutocompleteMatch& match = result.match_at(i);
     AutocompleteMatch::Type type = match.type;
     if (type != AutocompleteMatch::HISTORY_URL &&
         type != AutocompleteMatch::HISTORY_TITLE &&
         type != AutocompleteMatch::HISTORY_BODY &&
         type != AutocompleteMatch::HISTORY_KEYWORD &&
         type != AutocompleteMatch::NAVSUGGEST)
       continue;
     DictionaryValue* entry = new DictionaryValue();
     entry->SetString("title", match.description);
     entry->SetString("displayURL", match.contents);
     entry->SetString("url", match.destination_url.spec());
     suggestions.Append(entry);
   }
 
   web_ui_->CallJavascriptFunction(
       "BrowserOptions.updateAutocompleteSuggestions", suggestions);
 }