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

Unified Diff: content/renderer/render_view.cc

Issue 6683066: Remove render_messages_params files since they're not needed anymore. I moved the search provide... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 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 | « content/renderer/render_view.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view.cc
===================================================================
--- content/renderer/render_view.cc (revision 79639)
+++ content/renderer/render_view.cc (working copy)
@@ -1899,7 +1899,7 @@
void RenderView::AddGURLSearchProvider(
const GURL& osd_url,
- const ViewHostMsg_PageHasOSDD_Type& provider_type) {
+ search_provider::OSDDType provider_type) {
if (!osd_url.is_empty())
Send(new ViewHostMsg_PageHasOSDD(routing_id_, page_id_, osd_url,
provider_type));
@@ -1911,23 +1911,22 @@
void RenderView::AddSearchProvider(
const std::string& url,
- const ViewHostMsg_PageHasOSDD_Type& provider_type) {
- if (provider_type.type ==
- ViewHostMsg_PageHasOSDD_Type::EXPLICIT_DEFAULT_PROVIDER &&
+ search_provider::OSDDType provider_type) {
+ if (provider_type == search_provider::EXPLICIT_DEFAULT_PROVIDER &&
!webview()->mainFrame()->isProcessingUserGesture())
return;
AddGURLSearchProvider(GURL(url), provider_type);
}
-ViewHostMsg_GetSearchProviderInstallState_Params
+search_provider::InstallState
RenderView::GetSearchProviderInstallState(WebFrame* frame,
const std::string& url) {
GURL inquiry_url = GURL(url);
if (inquiry_url.is_empty())
- return ViewHostMsg_GetSearchProviderInstallState_Params::Denied();
+ return search_provider::DENIED;
- ViewHostMsg_GetSearchProviderInstallState_Params install;
+ search_provider::InstallState install;
Send(new ViewHostMsg_GetSearchProviderInstallState(routing_id_,
frame->url(),
inquiry_url,
@@ -2116,7 +2115,7 @@
Send(new ViewHostMsg_UpdateFaviconURL(routing_id_, page_id_, favicon_url));
AddGURLSearchProvider(webview()->mainFrame()->openSearchDescriptionURL(),
- ViewHostMsg_PageHasOSDD_Type::Autodetected());
+ search_provider::AUTODETECTED_PROVIDER);
Send(new ViewHostMsg_DidStopLoading(routing_id_));
« no previous file with comments | « content/renderer/render_view.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698