InstantExtended: local omnibox popup fixes.

chrome/browser/instant/local_omnibox_popup_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/instant/local_omnibox_popup_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 "content/public/common/content_client.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "net/url_request/url_request.h"
 
 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
 
 LocalOmniboxPopupSource::LocalOmniboxPopupSource() {
 }
 
 LocalOmniboxPopupSource::~LocalOmniboxPopupSource() {
 }
 
 std::string LocalOmniboxPopupSource::GetSource() {
   return chrome::kChromeSearchLocalOmniboxPopupHost;
 }
 
 void LocalOmniboxPopupSource::StartDataRequest(
     const std::string& path,
     bool is_incognito,
     const content::URLDataSource::GotDataCallback& callback) {
   int identifier = -1;
   if (path == kHTMLFilename) {
     identifier = IDR_LOCAL_OMNIBOX_POPUP_HTML;
   } else if (path == kJsFilename) {
     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;
   }
 
   scoped_refptr<base::RefCountedStaticMemory> response(
       content::GetContentClient()->GetDataResourceBytes(identifier));
   callback.Run(response);
 }
 
 std::string LocalOmniboxPopupSource::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 == kIconFilename || path == kIcon2xFilename)
+    return "image/png";
   return "";
 }
 
 bool LocalOmniboxPopupSource::ShouldServiceRequest(
     const net::URLRequest* request) const {
   DCHECK(request->url().host() == chrome::kChromeSearchLocalOmniboxPopupHost);
 
   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 == kCSSFilename || filename == kIconFilename ||
+        filename == kIcon2xFilename;
   }
   return false;
 }