more changes

chrome/browser/ui/webui/print_preview_ui.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/print_preview_ui.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/printing/print_preview_data_service.h"
@@ skipping 50 matching lines @@
 }
 
 void PrintPreviewUI::OnPrintPreviewRequest() {
   request_count_++;
 }
 
 void PrintPreviewUI::OnDidGetPreviewPageCount(
     const PrintHostMsg_DidGetPreviewPageCount_Params& params) {
   DCHECK_GT(params.page_count, 0);
   document_cookie_ = params.document_cookie;
-  base::FundamentalValue count(params.page_count);
-  base::FundamentalValue modifiable(params.is_modifiable);
-  base::FundamentalValue request_id(params.preview_request_id);
+  base::NumberValue count(params.page_count);
+  base::BooleanValue modifiable(params.is_modifiable);
+  base::NumberValue request_id(params.preview_request_id);
   CallJavascriptFunction("onDidGetPreviewPageCount", count, modifiable,
                          request_id);
 }
 
 void PrintPreviewUI::OnDidPreviewPage(int page_number,
                                       int preview_request_id) {
   DCHECK_GE(page_number, 0);
-  base::FundamentalValue number(page_number);
+  base::NumberValue number(page_number);
   StringValue ui_identifier(preview_ui_addr_str_);
-  base::FundamentalValue request_id(preview_request_id);
+  base::NumberValue request_id(preview_request_id);
   CallJavascriptFunction("onDidPreviewPage", number, ui_identifier, request_id);
 }
 
 void PrintPreviewUI::OnReusePreviewData(int preview_request_id) {
   DecrementRequestCount();
 
   base::StringValue ui_identifier(preview_ui_addr_str_);
-  base::FundamentalValue ui_preview_request_id(preview_request_id);
+  base::NumberValue ui_preview_request_id(preview_request_id);
   CallJavascriptFunction("reloadPreviewPages", ui_identifier,
                          ui_preview_request_id);
 }
 
 void PrintPreviewUI::OnPreviewDataIsAvailable(int expected_pages_count,
                                               const string16& job_title,
                                               int preview_request_id) {
   VLOG(1) << "Print preview request finished with "
           << expected_pages_count << " pages";
   DecrementRequestCount();
 
   if (!initial_preview_start_time_.is_null()) {
     UMA_HISTOGRAM_TIMES("PrintPreview.InitalDisplayTime",
                         base::TimeTicks::Now() - initial_preview_start_time_);
     UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.Initial",
                          expected_pages_count);
     initial_preview_start_time_ = base::TimeTicks();
   }
   base::StringValue title(job_title);
   base::StringValue ui_identifier(preview_ui_addr_str_);
-  base::FundamentalValue ui_preview_request_id(preview_request_id);
+  base::NumberValue ui_preview_request_id(preview_request_id);
   CallJavascriptFunction("updatePrintPreview", title, ui_identifier,
                          ui_preview_request_id);
 }
 
 void PrintPreviewUI::OnNavigation() {
   handler_->OnNavigation();
 }
 
 void PrintPreviewUI::OnFileSelectionCancelled() {
   CallJavascriptFunction("fileSelectionCancelled");
@@ skipping 17 matching lines @@
 }
 
 void PrintPreviewUI::DecrementRequestCount() {
   if (request_count_ > 0)
     request_count_--;
 }
 
 int PrintPreviewUI::document_cookie() {
   return document_cookie_;
 }