Merge local_omnibox_popup into local_ntp. Render the Google logo and fakebox if Google is the sear…

chrome/browser/search/local_ntp_source.cc

 // Copyright 2013 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/search/local_ntp_source.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_util.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
+#include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/theme_provider.h"
 
 namespace {
 
 const char kHtmlFilename[] = "local-ntp.html";
 const char kJSFilename[] = "local-ntp.js";
 const char kCssFilename[] = "local-ntp.css";
 const char kCloseBarFilename[] = "images/close_2.png";
 const char kCloseBarHoverFilename[] = "images/close_2_hover.png";
 const char kCloseBarActiveFilename[] = "images/close_2_active.png";
+const char kPageIconFilename[] = "images/page_icon.png";
+const char kPageIcon2xFilename[] = "images/2x/page_icon.png";
+const char kSearchIconFilename[] = "images/search_icon.png";
+const char kSearchIcon2xFilename[] = "images/2x/search_icon.png";
+// TODO(jeremycho): Add 2x images.
+const char kGoogleLogoFilename[] = "images/google_logo.png";
+const char kWhiteGoogleLogoFilename[] = "images/white_google_logo.png";
 
 }  // namespace
 
 LocalNtpSource::LocalNtpSource() {
 }
 
 LocalNtpSource::~LocalNtpSource() {
 }
 
 std::string LocalNtpSource::GetSource() {
@@ skipping 10 matching lines @@
   } else if (path == kJSFilename) {
     identifier = IDR_LOCAL_NTP_JS;
   } else if (path == kCssFilename) {
     identifier = IDR_LOCAL_NTP_CSS;
   } else if (path == kCloseBarFilename) {
     identifier = IDR_CLOSE_2;
   } else if (path == kCloseBarHoverFilename) {
     identifier = IDR_CLOSE_2_H;
   } else if (path == kCloseBarActiveFilename) {
     identifier = IDR_CLOSE_2_P;
+  } else if (path == kPageIconFilename) {
+    identifier = IDR_LOCAL_OMNIBOX_POPUP_IMAGES_PAGE_ICON_PNG;
+  } else if (path == kPageIcon2xFilename) {
+    identifier = IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_PAGE_ICON_PNG;
+  } else if (path == kSearchIconFilename) {
+    identifier = IDR_LOCAL_OMNIBOX_POPUP_IMAGES_SEARCH_ICON_PNG;
+  } else if (path == kSearchIcon2xFilename) {
+    identifier = IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_SEARCH_ICON_PNG;
+  } else if (path == kGoogleLogoFilename) {
+    identifier = IDR_NEWTAB_GOOGLE_LOGO;
+  } else if (path == kWhiteGoogleLogoFilename) {
+    identifier = IDR_NEWTAB_WHITE_GOOGLE_LOGO;
   } else {
     callback.Run(NULL);
     return;
   }
 
   scoped_refptr<base::RefCountedStaticMemory> response(
       ResourceBundle::GetSharedInstance().LoadDataResourceBytes(identifier));
   callback.Run(response);
 }
 
 std::string LocalNtpSource::GetMimeType(
     const std::string& path) const {
   if (path == kHtmlFilename)
     return "text/html";
   if (path == kJSFilename)
     return "application/javascript";
   if (path == kCssFilename)
     return "text/css";
   if (path == kCloseBarFilename || path == kCloseBarHoverFilename ||
-      path == kCloseBarActiveFilename) {
+      path == kCloseBarActiveFilename || path == kPageIconFilename ||
+      path == kPageIcon2xFilename || path == kSearchIconFilename ||
+      path == kSearchIcon2xFilename || path == kGoogleLogoFilename ||
+      path == kWhiteGoogleLogoFilename) {
     return "image/png";
   }
   return std::string();
 }
 
 bool LocalNtpSource::ShouldServiceRequest(
     const net::URLRequest* request) const {
   DCHECK(request->url().host() == chrome::kChromeSearchLocalNtpHost);
 
   if (request->url().SchemeIs(chrome::kChromeSearchScheme)) {
     DCHECK(StartsWithASCII(request->url().path(), "/", true));
     std::string filename = request->url().path().substr(1);
     return filename == kHtmlFilename || filename == kJSFilename ||
            filename == kCssFilename || filename == kCloseBarFilename ||
            filename == kCloseBarHoverFilename ||
-           filename == kCloseBarActiveFilename;
+           filename == kCloseBarActiveFilename ||
+           filename == kPageIconFilename || filename == kPageIcon2xFilename ||
+           filename == kSearchIconFilename ||
+           filename == kSearchIcon2xFilename ||
+           filename == kGoogleLogoFilename ||
+           filename == kWhiteGoogleLogoFilename;

[samarth, 2013/04/15 19:01:34]

This was fine when we had a couple of files but it's getting a bit out of hand
now. How about defining a struct with the following fields?
const char* filename;
int resource_identifier;
const char* mime_type;

You could just define an array of these structures and simplify all the code in
this file using it.

[jeremycho, 2013/04/16 01:42:37]

Done.

   }
   return false;
 }