chrome-search: should not be display-isolated

chrome/renderer/searchbox/searchbox.cc

 // Copyright 2012 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/renderer/searchbox/searchbox.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #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"

[Shishir, 2013/03/20 21:35:52]

Dont need this.

[dhollowa, 2013/03/20 22:15:08]

Done.

 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
 SearchBox::SearchBox(content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<SearchBox>(render_view),
       verbatim_(false),
       selection_start_(0),
       selection_end_(0),
       results_base_(0),
       start_margin_(0),
@@ skipping 134 matching lines @@
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxCancelSelection,
                         OnCancelSelection)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSetDisplayInstantResults,
                         OnSetDisplayInstantResults)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxKeyCaptureChanged,
                         OnKeyCaptureChange)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxThemeChanged,
                         OnThemeChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxFontInformation,
                         OnFontInformationReceived)
-    IPC_MESSAGE_HANDLER(
-        ChromeViewMsg_SearchBoxGrantChromeSearchAccessFromOrigin,
-        OnGrantChromeSearchAccessFromOrigin)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMostVisitedItemsChanged,
                         OnMostVisitedChanged)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SearchBox::DidClearWindowObject(WebKit::WebFrame* frame) {
   extensions_v8::SearchBoxExtension::DispatchOnWindowReady(frame);
 }
@@ skipping 127 matching lines @@
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 void SearchBox::OnFontInformationReceived(const string16& omnibox_font,
                                           size_t omnibox_font_size) {
   omnibox_font_ = 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) {
     double zoom = WebKit::WebView::zoomLevelToZoomFactor(web_view->zoomLevel());
     if (zoom != 0)
       return zoom;
   }
   return 1.0;
 }
 
@@ skipping 22 matching lines @@
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchMostVisitedChanged(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 const std::vector<InstantMostVisitedItem>&
 SearchBox::GetMostVisitedItems() const {
   return most_visited_items_;
 }