| Index: chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
|
| diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
|
| index 765762c8a7c8e37163b3a5c780fcc27474be1bac..9384d87d85d0c66c89206c4c852a8a1d0e2463b5 100644
|
| --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
|
| +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
|
| @@ -54,7 +54,7 @@ void FaviconWebUIHandler::OnFaviconDataAvailable(
|
| FaviconService* favicon_service =
|
| Profile::FromWebUI(web_ui_)->GetFaviconService(Profile::EXPLICIT_ACCESS);
|
| int id = consumer_.GetClientData(favicon_service, request_handle);
|
| - base::FundamentalValue id_value(id);
|
| + base::NumberValue id_value(id);
|
| scoped_ptr<StringValue> color_value;
|
|
|
| if (favicon.is_valid()) {
|
| @@ -67,9 +67,9 @@ void FaviconWebUIHandler::OnFaviconDataAvailable(
|
| SkColorGetR(color),
|
| SkColorGetG(color),
|
| SkColorGetB(color));
|
| - color_value.reset(new StringValue(css_color));
|
| + color_value.reset(base::StringValue::New(css_color));
|
| } else {
|
| - color_value.reset(new StringValue("#919191"));
|
| + color_value.reset(base::StringValue::New("#919191"));
|
| }
|
|
|
| web_ui_->CallJavascriptFunction("ntp4.setFaviconDominantColor",
|
|
|