| OLD | NEW |
| 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 769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 IPC_MESSAGE_HANDLER(ViewHostMsg_DidPrintPage, DidPrintPage) | 780 IPC_MESSAGE_HANDLER(ViewHostMsg_DidPrintPage, DidPrintPage) |
| 781 IPC_MESSAGE_HANDLER(ViewHostMsg_AddMessageToConsole, OnAddMessageToConsole) | 781 IPC_MESSAGE_HANDLER(ViewHostMsg_AddMessageToConsole, OnAddMessageToConsole) |
| 782 IPC_MESSAGE_HANDLER(ViewHostMsg_ForwardToDevToolsAgent, | 782 IPC_MESSAGE_HANDLER(ViewHostMsg_ForwardToDevToolsAgent, |
| 783 OnForwardToDevToolsAgent); | 783 OnForwardToDevToolsAgent); |
| 784 IPC_MESSAGE_HANDLER(ViewHostMsg_ForwardToDevToolsClient, | 784 IPC_MESSAGE_HANDLER(ViewHostMsg_ForwardToDevToolsClient, |
| 785 OnForwardToDevToolsClient); | 785 OnForwardToDevToolsClient); |
| 786 IPC_MESSAGE_HANDLER(ViewHostMsg_ActivateDevToolsWindow, | 786 IPC_MESSAGE_HANDLER(ViewHostMsg_ActivateDevToolsWindow, |
| 787 OnActivateDevToolsWindow); | 787 OnActivateDevToolsWindow); |
| 788 IPC_MESSAGE_HANDLER(ViewHostMsg_CloseDevToolsWindow, | 788 IPC_MESSAGE_HANDLER(ViewHostMsg_CloseDevToolsWindow, |
| 789 OnCloseDevToolsWindow); | 789 OnCloseDevToolsWindow); |
| 790 IPC_MESSAGE_HANDLER(ViewHostMsg_DockDevToolsWindow, | 790 IPC_MESSAGE_HANDLER(ViewHostMsg_RequestDockDevToolsWindow, |
| 791 OnDockDevToolsWindow); | 791 OnRequestDockDevToolsWindow); |
| 792 IPC_MESSAGE_HANDLER(ViewHostMsg_UndockDevToolsWindow, | 792 IPC_MESSAGE_HANDLER(ViewHostMsg_RequestUndockDevToolsWindow, |
| 793 OnUndockDevToolsWindow); | 793 OnRequestUndockDevToolsWindow); |
| 794 IPC_MESSAGE_HANDLER(ViewHostMsg_DevToolsRuntimeFeatureStateChanged, | 794 IPC_MESSAGE_HANDLER(ViewHostMsg_DevToolsRuntimeFeatureStateChanged, |
| 795 OnDevToolsRuntimeFeatureStateChanged); | 795 OnDevToolsRuntimeFeatureStateChanged); |
| 796 IPC_MESSAGE_HANDLER(ViewHostMsg_UserMetricsRecordAction, | 796 IPC_MESSAGE_HANDLER(ViewHostMsg_UserMetricsRecordAction, |
| 797 OnUserMetricsRecordAction) | 797 OnUserMetricsRecordAction) |
| 798 IPC_MESSAGE_HANDLER(ViewHostMsg_MissingPluginStatus, OnMissingPluginStatus); | 798 IPC_MESSAGE_HANDLER(ViewHostMsg_MissingPluginStatus, OnMissingPluginStatus); |
| 799 IPC_MESSAGE_HANDLER(ViewHostMsg_CrashedPlugin, OnCrashedPlugin); | 799 IPC_MESSAGE_HANDLER(ViewHostMsg_CrashedPlugin, OnCrashedPlugin); |
| 800 IPC_MESSAGE_HANDLER(ViewHostMsg_SendCurrentPageAllSavableResourceLinks, | 800 IPC_MESSAGE_HANDLER(ViewHostMsg_SendCurrentPageAllSavableResourceLinks, |
| 801 OnReceivedSavableResourceLinksForCurrentPage); | 801 OnReceivedSavableResourceLinksForCurrentPage); |
| 802 IPC_MESSAGE_HANDLER(ViewHostMsg_SendSerializedHtmlData, | 802 IPC_MESSAGE_HANDLER(ViewHostMsg_SendSerializedHtmlData, |
| 803 OnReceivedSerializedHtmlData); | 803 OnReceivedSerializedHtmlData); |
| (...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1438 } | 1438 } |
| 1439 | 1439 |
| 1440 void RenderViewHost::OnActivateDevToolsWindow() { | 1440 void RenderViewHost::OnActivateDevToolsWindow() { |
| 1441 DevToolsManager::GetInstance()->ActivateWindow(this); | 1441 DevToolsManager::GetInstance()->ActivateWindow(this); |
| 1442 } | 1442 } |
| 1443 | 1443 |
| 1444 void RenderViewHost::OnCloseDevToolsWindow() { | 1444 void RenderViewHost::OnCloseDevToolsWindow() { |
| 1445 DevToolsManager::GetInstance()->CloseWindow(this); | 1445 DevToolsManager::GetInstance()->CloseWindow(this); |
| 1446 } | 1446 } |
| 1447 | 1447 |
| 1448 void RenderViewHost::OnDockDevToolsWindow() { | 1448 void RenderViewHost::OnRequestDockDevToolsWindow() { |
| 1449 DevToolsManager::GetInstance()->DockWindow(this); | 1449 DevToolsManager::GetInstance()->RequestDockWindow(this); |
| 1450 } | 1450 } |
| 1451 | 1451 |
| 1452 void RenderViewHost::OnUndockDevToolsWindow() { | 1452 void RenderViewHost::OnRequestUndockDevToolsWindow() { |
| 1453 DevToolsManager::GetInstance()->UndockWindow(this); | 1453 DevToolsManager::GetInstance()->RequestUndockWindow(this); |
| 1454 } | 1454 } |
| 1455 | 1455 |
| 1456 void RenderViewHost::OnDevToolsRuntimeFeatureStateChanged( | 1456 void RenderViewHost::OnDevToolsRuntimeFeatureStateChanged( |
| 1457 const std::string& feature, | 1457 const std::string& feature, |
| 1458 bool enabled) { | 1458 bool enabled) { |
| 1459 DevToolsManager::GetInstance()-> | 1459 DevToolsManager::GetInstance()-> |
| 1460 RuntimeFeatureStateChanged(this, feature, enabled); | 1460 RuntimeFeatureStateChanged(this, feature, enabled); |
| 1461 } | 1461 } |
| 1462 | 1462 |
| 1463 void RenderViewHost::OnUserMetricsRecordAction(const std::string& action) { | 1463 void RenderViewHost::OnUserMetricsRecordAction(const std::string& action) { |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1853 integration_delegate->OnPageTranslated(page_id, original_lang, | 1853 integration_delegate->OnPageTranslated(page_id, original_lang, |
| 1854 translated_lang, error_type); | 1854 translated_lang, error_type); |
| 1855 } | 1855 } |
| 1856 | 1856 |
| 1857 void RenderViewHost::OnContentBlocked(ContentSettingsType type) { | 1857 void RenderViewHost::OnContentBlocked(ContentSettingsType type) { |
| 1858 RenderViewHostDelegate::Resource* resource_delegate = | 1858 RenderViewHostDelegate::Resource* resource_delegate = |
| 1859 delegate_->GetResourceDelegate(); | 1859 delegate_->GetResourceDelegate(); |
| 1860 if (resource_delegate) | 1860 if (resource_delegate) |
| 1861 resource_delegate->OnContentBlocked(type); | 1861 resource_delegate->OnContentBlocked(type); |
| 1862 } | 1862 } |
| OLD | NEW |