[Icons NTP] Allow chrome-search:// large-icon and fallback-icon hosts to use <view_id>/<restricted_…

chrome/renderer/chrome_content_renderer_client.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/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 1362 matching lines @@
     return true;
   }
 #endif
 
   const content::RenderView* render_view =
       content::RenderView::FromWebView(frame->view());
   SearchBox* search_box = SearchBox::Get(render_view);
   if (search_box && url.SchemeIs(chrome::kChromeSearchScheme)) {
     if (url.host() == chrome::kChromeUIThumbnailHost)
       return search_box->GenerateThumbnailURLFromTransientURL(url, new_url);
-    else if (url.host() == chrome::kChromeUIFaviconHost)
+    if (url.host() == chrome::kChromeUIFaviconHost)

[James Hawkins, 2015/03/17 21:46:41]

Shouldn't these all be else if since the hosts are mutually exclusive?

[huangs, 2015/03/18 21:43:10]

I thought you don't need else if returning?

       return search_box->GenerateFaviconURLFromTransientURL(url, new_url);
+    if (url.host() == chrome::kChromeUILargeIconHost)
+      return search_box->GenerateLargeIconURLFromTransientURL(url, new_url);
+    if (url.host() == chrome::kChromeUIFallbackIconHost)
+      return search_box->GenerateFallbackIconURLFromTransientURL(url, new_url);
   }
 
   return false;
 }
 
 void ChromeContentRendererClient::DidCreateScriptContext(
     blink::WebLocalFrame* frame,
     v8::Handle<v8::Context> context,
     int extension_group,
     int world_id) {
@@ skipping 257 matching lines @@
   if (mime_type == content::kBrowserPluginMimeType) {
     return new extensions::ExtensionsGuestViewContainer(render_frame);
   } else {
     return new extensions::MimeHandlerViewContainer(
         render_frame, mime_type, original_url);
   }
 #else
   return NULL;
 #endif
 }