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

Unified Diff: chrome/renderer/searchbox/searchbox.cc

Issue 12621008: chrome-search: should not be display-isolated (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased to HEAD Created 7 years, 9 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
« no previous file with comments | « chrome/renderer/searchbox/searchbox.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/searchbox/searchbox.cc
diff --git a/chrome/renderer/searchbox/searchbox.cc b/chrome/renderer/searchbox/searchbox.cc
index 61718479824c53fa855dc606026db9ac03a418f5..d31811fe963015883c9d5b3d8dfe22621d05540a 100644
--- a/chrome/renderer/searchbox/searchbox.cc
+++ b/chrome/renderer/searchbox/searchbox.cc
@@ -9,7 +9,6 @@
#include "chrome/common/url_constants.h"
#include "chrome/renderer/searchbox/searchbox_extension.h"
#include "content/public/renderer/render_view.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
namespace {
@@ -163,9 +162,6 @@ bool SearchBox::OnMessageReceived(const IPC::Message& message) {
OnThemeChanged)
IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxFontInformation,
OnFontInformationReceived)
- IPC_MESSAGE_HANDLER(
- ChromeViewMsg_SearchBoxGrantChromeSearchAccessFromOrigin,
- OnGrantChromeSearchAccessFromOrigin)
IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMostVisitedItemsChanged,
OnMostVisitedChanged)
IPC_MESSAGE_UNHANDLED(handled = false)
@@ -312,25 +308,6 @@ void SearchBox::OnFontInformationReceived(const string16& omnibox_font,
omnibox_font_size_ = omnibox_font_size;
}
-void SearchBox::OnGrantChromeSearchAccessFromOrigin(const GURL& origin_url) {
- string16 chrome_search_scheme(ASCIIToUTF16(chrome::kChromeSearchScheme));
- WebKit::WebSecurityPolicy::addOriginAccessWhitelistEntry(
- origin_url,
- chrome_search_scheme,
- ASCIIToUTF16(chrome::kChromeUIFaviconHost),
- false);
- WebKit::WebSecurityPolicy::addOriginAccessWhitelistEntry(
- origin_url,
- chrome_search_scheme,
- ASCIIToUTF16(chrome::kChromeUIThemeHost),
- false);
- WebKit::WebSecurityPolicy::addOriginAccessWhitelistEntry(
- origin_url,
- chrome_search_scheme,
- ASCIIToUTF16(chrome::kChromeUIThumbnailHost),
- false);
-}
-
double SearchBox::GetZoom() const {
WebKit::WebView* web_view = render_view()->GetWebView();
if (web_view) {
« no previous file with comments | « chrome/renderer/searchbox/searchbox.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698