Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2976)

Unified Diff: chrome/browser/search/suggestion_source.cc

Issue 13375003: Fixing iframe jank in the local omnibox popup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing sites, too. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/search/suggestion_source.cc
diff --git a/chrome/browser/search/suggestion_source.cc b/chrome/browser/search/suggestion_source.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d5525756764cb24039208457dc5ccc8efd197826
--- /dev/null
+++ b/chrome/browser/search/suggestion_source.cc
@@ -0,0 +1,129 @@
+// 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/suggestion_source.h"
+
+#include "base/json/string_escape.h"
+#include "base/logging.h"
+#include "base/memory/ref_counted_memory.h"
+#include "base/string_util.h"
+#include "base/strings/string_piece.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/search/instant_io_context.h"
+#include "chrome/browser/search/search.h"
+#include "chrome/common/url_constants.h"
+#include "googleurl/src/gurl.h"
+#include "grit/browser_resources.h"
+#include "net/base/url_util.h"
+#include "net/url_request/url_request.h"
+#include "ui/base/layout.h"
+#include "ui/base/resource/resource_bundle.h"
+
+namespace {
+
+const char kLoaderHtmlPath[] = "/loader.html";
+const char kLoaderJSPath[] = "/loader.js";
+const char kResultHtmlPath[] = "/result.html";
+const char kResultJSPath[] = "/result.js";
+const char kOriginParam[] = "origin";
+
+} // namespace
+
+SuggestionSource::SuggestionSource() {
+}
+
+SuggestionSource::~SuggestionSource() {
+}
+
+std::string SuggestionSource::GetSource() {
+ return chrome::kChromeSearchSuggestionHost;
+}
+
+void SuggestionSource::StartDataRequest(
+ const std::string& path_and_query,
+ bool is_incognito,
+ const content::URLDataSource::GotDataCallback& callback) {
+ std::string path(GURL(chrome::kChromeSearchSuggestionUrl +
+ path_and_query).path());
+ if (path == kLoaderHtmlPath)
+ SendResource(IDR_OMNIBOX_RESULT_LOADER_HTML, callback);
+ else if (path == kLoaderJSPath)
+ SendJSWithOrigin(IDR_OMNIBOX_RESULT_LOADER_JS, path_and_query, callback);
+ else if (path == kResultHtmlPath)
+ SendResource(IDR_OMNIBOX_RESULT_HTML, callback);
+ else if (path == kResultJSPath)
+ SendJSWithOrigin(IDR_OMNIBOX_RESULT_JS, path_and_query, callback);
+ else
+ callback.Run(NULL);
+}
+
+void SuggestionSource::SendResource(
+ int resource_id,
+ const content::URLDataSource::GotDataCallback& callback) {
+ scoped_refptr<base::RefCountedStaticMemory> response(
+ ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id));
+ callback.Run(response);
+}
+
+void SuggestionSource::SendJSWithOrigin(
+ int resource_id,
+ const std::string& path_and_query,
+ const content::URLDataSource::GotDataCallback& callback) {
+ // &origin is used to check the source of postMessage() requests to
+ // suggestion iframes. It is added below in WillServiceRequest().
+ std::string origin;
+ if (!net::GetValueForKeyInQuery(
+ GURL(chrome::kChromeSearchSuggestionUrl + path_and_query),
+ kOriginParam, &origin) ||
+ !GURL(origin).GetOrigin().is_valid()) {
+ callback.Run(NULL);
+ return;
+ }
+
+ std::string js_escaped_origin;
+ base::JsonDoubleQuote(origin, false, &js_escaped_origin);
+ base::StringPiece template_js =
+ ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+ std::string response(template_js.as_string());
+ ReplaceFirstSubstringAfterOffset(&response, 0, "{{ORIGIN}}", origin);
+ callback.Run(base::RefCountedString::TakeString(&response));
+}
+
+std::string SuggestionSource::GetMimeType(
+ const std::string& path_and_query) const {
+ std::string path(GURL(chrome::kChromeSearchSuggestionUrl +
+ path_and_query).path());
+ if (path == kLoaderHtmlPath || path == kResultHtmlPath)
+ return "text/html";
+ if (path == kLoaderJSPath || path == kResultJSPath)
+ return "application/javascript";
+ return "";
+}
+
+bool SuggestionSource::ShouldServiceRequest(
+ const net::URLRequest* request) const {
+ const std::string& path = request->url().path();
+ return InstantIOContext::ShouldServiceRequest(request) &&
+ request->url().SchemeIs(chrome::kChromeSearchScheme) &&
+ request->url().host() == chrome::kChromeSearchSuggestionHost &&
+ (path == kLoaderHtmlPath || path == kLoaderJSPath ||
+ path == kResultHtmlPath || path == kResultJSPath);
+}
+
+void SuggestionSource::WillServiceRequest(
+ const net::URLRequest* request, std::string* path) const {
+ GURL url(chrome::kChromeSearchSuggestionUrl + (*path));
+ // Note that this replaces any existing query string parameters, including
+ // any existing &origin parameter.
+ GURL::Replacements set_origin;
+ std::string query_str = "origin=";
+ query_str.append(InstantIOContext::GetExpectedOrigin(request));
+ set_origin.SetQueryStr(query_str);
+ GURL url_with_origin(url.ReplaceComponents(set_origin));
+ *path = url_with_origin.path().substr(1) + "?" + url_with_origin.query();
+}
+
+bool SuggestionSource::ShouldDenyXFrameOptions() const {
+ return false;
+}

Powered by Google App Engine
This is Rietveld 408576698