Index: chrome/browser/instant/local_ntp_source.cc |
diff --git a/chrome/browser/instant/local_omnibox_popup_source.cc b/chrome/browser/instant/local_ntp_source.cc |
similarity index 65% |
copy from chrome/browser/instant/local_omnibox_popup_source.cc |
copy to chrome/browser/instant/local_ntp_source.cc |
index 1b64fe9f51d73a802fd6d59746dc3358dd203ed6..49eb8c49b0a3cdb26cd5f917c714e3cf55bfc3c0 100644 |
--- a/chrome/browser/instant/local_omnibox_popup_source.cc |
+++ b/chrome/browser/instant/local_ntp_source.cc |
@@ -2,7 +2,7 @@ |
// 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 "chrome/browser/instant/local_ntp_source.h" |
#include "base/logging.h" |
#include "base/memory/ref_counted_memory.h" |
@@ -15,33 +15,33 @@ |
namespace { |
-const char kHTMLFilename[] = "local-omnibox-popup.html"; |
-const char kJsFilename[] = "local-omnibox-popup.js"; |
-const char kCSSFilename[] = "local-omnibox-popup.css"; |
+const char kHTMLFilename[] = "local-ntp.html"; |
+const char kJsFilename[] = "local-ntp.js"; |
+const char kCSSFilename[] = "local-ntp.css"; |
} // namespace |
-LocalOmniboxPopupSource::LocalOmniboxPopupSource() { |
+LocalNTPSource::LocalNTPSource() { |
} |
-LocalOmniboxPopupSource::~LocalOmniboxPopupSource() { |
+LocalNTPSource::~LocalNTPSource() { |
} |
-std::string LocalOmniboxPopupSource::GetSource() { |
- return chrome::kChromeSearchLocalOmniboxPopupHost; |
+std::string LocalNTPSource::GetSource() { |
+ return chrome::kChromeSearchLocalNTPHost; |
} |
-void LocalOmniboxPopupSource::StartDataRequest( |
+void LocalNTPSource::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; |
+ identifier = IDR_LOCAL_NTP_HTML; |
} else if (path == kJsFilename) { |
- identifier = IDR_LOCAL_OMNIBOX_POPUP_JS; |
+ identifier = IDR_LOCAL_NTP_JS; |
} else if (path == kCSSFilename) { |
- identifier = IDR_LOCAL_OMNIBOX_POPUP_CSS; |
+ identifier = IDR_LOCAL_NTP_CSS; |
} else { |
callback.Run(NULL); |
return; |
@@ -52,7 +52,7 @@ void LocalOmniboxPopupSource::StartDataRequest( |
callback.Run(response); |
} |
-std::string LocalOmniboxPopupSource::GetMimeType( |
+std::string LocalNTPSource::GetMimeType( |
const std::string& path) const { |
if (path == kHTMLFilename) |
return "text/html"; |
@@ -63,9 +63,9 @@ std::string LocalOmniboxPopupSource::GetMimeType( |
return ""; |
} |
-bool LocalOmniboxPopupSource::ShouldServiceRequest( |
+bool LocalNTPSource::ShouldServiceRequest( |
const net::URLRequest* request) const { |
- DCHECK(request->url().host() == chrome::kChromeSearchLocalOmniboxPopupHost); |
+ DCHECK_EQ(request->url().host(), chrome::kChromeSearchLocalNTPHost); |
if (request->url().SchemeIs(chrome::kChromeSearchScheme)) { |
DCHECK(StartsWithASCII(request->url().path(), "/", true)); |