InstantExtended: local omnibox popup fixes.

chrome/browser/instant/local_omnibox_popup_source.cc

Index: chrome/browser/instant/local_omnibox_popup_source.cc
diff --git a/chrome/browser/instant/local_omnibox_popup_source.cc b/chrome/browser/instant/local_omnibox_popup_source.cc
index 1b64fe9f51d73a802fd6d59746dc3358dd203ed6..c17f3ad5d2f46f7847261ed53afbf6a4b289c392 100644
--- a/chrome/browser/instant/local_omnibox_popup_source.cc
+++ b/chrome/browser/instant/local_omnibox_popup_source.cc
@@ -18,6 +18,8 @@ namespace {
 const char kHTMLFilename[] = "local-omnibox-popup.html";
 const char kJsFilename[] = "local-omnibox-popup.js";
 const char kCSSFilename[] = "local-omnibox-popup.css";
+const char kIconFilename[] = "images/page_icon.png";
+const char kIcon2xFilename[] = "images/page_icon.png";

[Jered, 2013/03/15 17:05:06]

Should these file names be the same?

[samarth, 2013/03/15 21:58:27]

Oops, yeah fixed.

 
 }  // namespace
 
@@ -42,6 +44,10 @@ void LocalOmniboxPopupSource::StartDataRequest(
     identifier = IDR_LOCAL_OMNIBOX_POPUP_JS;
   } else if (path == kCSSFilename) {
     identifier = IDR_LOCAL_OMNIBOX_POPUP_CSS;
+  } else if (path == kIconFilename) {
+    identifier = IDR_LOCAL_OMNIBOX_POPUP_IMAGES_PAGE_ICON_PNG;
+  } else if (path == kIcon2xFilename) {
+    identifier = IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_PAGE_ICON_PNG;
   } else {
     callback.Run(NULL);
     return;
@@ -60,6 +66,8 @@ std::string LocalOmniboxPopupSource::GetMimeType(
     return "application/javascript";
   if (path == kCSSFilename)
     return "text/css";
+  if (path == kIconFilename || path == kIcon2xFilename)
+    return "image/png";
   return "";
 }
 
@@ -71,7 +79,8 @@ bool LocalOmniboxPopupSource::ShouldServiceRequest(
     DCHECK(StartsWithASCII(request->url().path(), "/", true));
     std::string filename = request->url().path().substr(1);
     return filename == kHTMLFilename || filename == kJsFilename ||
-        filename == kCSSFilename;
+        filename == kCSSFilename || filename == kIconFilename ||
+        filename == kIcon2xFilename;
   }
   return false;
 }