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

Side by Side Diff: chrome/browser/renderer_host/render_view_host.cc

Issue 5917001: Change the "Disable outdated plug-ins" lab to block them instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename command line switch and viewmsg Created 10 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_host/render_view_host.h" 5 #include "chrome/browser/renderer_host/render_view_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 IPC_MESSAGE_HANDLER(ViewHostMsg_CloseDevToolsWindow, 843 IPC_MESSAGE_HANDLER(ViewHostMsg_CloseDevToolsWindow,
844 OnCloseDevToolsWindow); 844 OnCloseDevToolsWindow);
845 IPC_MESSAGE_HANDLER(ViewHostMsg_RequestDockDevToolsWindow, 845 IPC_MESSAGE_HANDLER(ViewHostMsg_RequestDockDevToolsWindow,
846 OnRequestDockDevToolsWindow); 846 OnRequestDockDevToolsWindow);
847 IPC_MESSAGE_HANDLER(ViewHostMsg_RequestUndockDevToolsWindow, 847 IPC_MESSAGE_HANDLER(ViewHostMsg_RequestUndockDevToolsWindow,
848 OnRequestUndockDevToolsWindow); 848 OnRequestUndockDevToolsWindow);
849 IPC_MESSAGE_HANDLER(ViewHostMsg_DevToolsRuntimePropertyChanged, 849 IPC_MESSAGE_HANDLER(ViewHostMsg_DevToolsRuntimePropertyChanged,
850 OnDevToolsRuntimePropertyChanged); 850 OnDevToolsRuntimePropertyChanged);
851 IPC_MESSAGE_HANDLER(ViewHostMsg_MissingPluginStatus, OnMissingPluginStatus); 851 IPC_MESSAGE_HANDLER(ViewHostMsg_MissingPluginStatus, OnMissingPluginStatus);
852 IPC_MESSAGE_HANDLER(ViewHostMsg_CrashedPlugin, OnCrashedPlugin); 852 IPC_MESSAGE_HANDLER(ViewHostMsg_CrashedPlugin, OnCrashedPlugin);
853 IPC_MESSAGE_HANDLER(ViewHostMsg_DisabledOutdatedPlugin, 853 IPC_MESSAGE_HANDLER(ViewHostMsg_BlockedOutdatedPlugin,
854 OnDisabledOutdatedPlugin); 854 OnBlockedOutdatedPlugin);
855 IPC_MESSAGE_HANDLER(ViewHostMsg_SendCurrentPageAllSavableResourceLinks, 855 IPC_MESSAGE_HANDLER(ViewHostMsg_SendCurrentPageAllSavableResourceLinks,
856 OnReceivedSavableResourceLinksForCurrentPage); 856 OnReceivedSavableResourceLinksForCurrentPage);
857 IPC_MESSAGE_HANDLER(ViewHostMsg_SendSerializedHtmlData, 857 IPC_MESSAGE_HANDLER(ViewHostMsg_SendSerializedHtmlData,
858 OnReceivedSerializedHtmlData); 858 OnReceivedSerializedHtmlData);
859 IPC_MESSAGE_HANDLER(ViewHostMsg_DidGetApplicationInfo, 859 IPC_MESSAGE_HANDLER(ViewHostMsg_DidGetApplicationInfo,
860 OnDidGetApplicationInfo); 860 OnDidGetApplicationInfo);
861 IPC_MESSAGE_HANDLER(ViewHostMsg_InstallApplication, 861 IPC_MESSAGE_HANDLER(ViewHostMsg_InstallApplication,
862 OnInstallApplication); 862 OnInstallApplication);
863 IPC_MESSAGE_FORWARD(ViewHostMsg_JSOutOfMemory, delegate_, 863 IPC_MESSAGE_FORWARD(ViewHostMsg_JSOutOfMemory, delegate_,
864 RenderViewHostDelegate::OnJSOutOfMemory); 864 RenderViewHostDelegate::OnJSOutOfMemory);
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 integration_delegate->OnMissingPluginStatus(status); 1632 integration_delegate->OnMissingPluginStatus(status);
1633 } 1633 }
1634 1634
1635 void RenderViewHost::OnCrashedPlugin(const FilePath& plugin_path) { 1635 void RenderViewHost::OnCrashedPlugin(const FilePath& plugin_path) {
1636 RenderViewHostDelegate::BrowserIntegration* integration_delegate = 1636 RenderViewHostDelegate::BrowserIntegration* integration_delegate =
1637 delegate_->GetBrowserIntegrationDelegate(); 1637 delegate_->GetBrowserIntegrationDelegate();
1638 if (integration_delegate) 1638 if (integration_delegate)
1639 integration_delegate->OnCrashedPlugin(plugin_path); 1639 integration_delegate->OnCrashedPlugin(plugin_path);
1640 } 1640 }
1641 1641
1642 void RenderViewHost::OnDisabledOutdatedPlugin(const string16& name, 1642 void RenderViewHost::OnBlockedOutdatedPlugin(const string16& name,
1643 const GURL& update_url) { 1643 const GURL& update_url) {
1644 RenderViewHostDelegate::BrowserIntegration* integration_delegate = 1644 RenderViewHostDelegate::BrowserIntegration* integration_delegate =
1645 delegate_->GetBrowserIntegrationDelegate(); 1645 delegate_->GetBrowserIntegrationDelegate();
1646 if (integration_delegate) 1646 if (integration_delegate)
1647 integration_delegate->OnDisabledOutdatedPlugin(name, update_url); 1647 integration_delegate->OnBlockedOutdatedPlugin(name, update_url);
1648 } 1648 }
1649 1649
1650 void RenderViewHost::GetAllSavableResourceLinksForCurrentPage( 1650 void RenderViewHost::GetAllSavableResourceLinksForCurrentPage(
1651 const GURL& page_url) { 1651 const GURL& page_url) {
1652 Send(new ViewMsg_GetAllSavableResourceLinksForCurrentPage(routing_id(), 1652 Send(new ViewMsg_GetAllSavableResourceLinksForCurrentPage(routing_id(),
1653 page_url)); 1653 page_url));
1654 } 1654 }
1655 1655
1656 void RenderViewHost::OnReceivedSavableResourceLinksForCurrentPage( 1656 void RenderViewHost::OnReceivedSavableResourceLinksForCurrentPage(
1657 const std::vector<GURL>& resources_list, 1657 const std::vector<GURL>& resources_list,
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
2252 if (printer_query.get()) { 2252 if (printer_query.get()) {
2253 BrowserThread::PostTask( 2253 BrowserThread::PostTask(
2254 BrowserThread::IO, FROM_HERE, 2254 BrowserThread::IO, FROM_HERE,
2255 NewRunnableMethod(printer_query.get(), 2255 NewRunnableMethod(printer_query.get(),
2256 &printing::PrinterQuery::StopWorker)); 2256 &printing::PrinterQuery::StopWorker));
2257 } 2257 }
2258 2258
2259 // Send the printingDone msg for now. 2259 // Send the printingDone msg for now.
2260 Send(new ViewMsg_PrintingDone(routing_id(), -1, true)); 2260 Send(new ViewMsg_PrintingDone(routing_id(), -1, true));
2261 } 2261 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/render_view_host.h ('k') | chrome/browser/renderer_host/render_view_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698