| Index: chrome/renderer/searchbox/searchbox.cc
|
| diff --git a/chrome/renderer/searchbox/searchbox.cc b/chrome/renderer/searchbox/searchbox.cc
|
| index 348e894c10f0eb085743fb247910e5f3bdc04957..f3aecc1f08c98340f01d93852743fb779d28fee6 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"
|
|
|
| SearchBox::SearchBox(content::RenderView* render_view)
|
| @@ -164,9 +163,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)
|
| @@ -314,25 +310,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) {
|
|
|