diff options
Diffstat (limited to 'chrome/browser')
43 files changed, 156 insertions, 140 deletions
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 7c41ba4..c7543d4 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -506,8 +506,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, AutofillAfterTranslate) { ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(), url)); // Get translation bar. - render_view_host()->OnMessageReceived(ViewHostMsg_TranslateLanguageDetermined( - 0, "ja", true)); + render_view_host()->OnMessageReceived( + ChromeViewHostMsg_TranslateLanguageDetermined(0, "ja", true)); TranslateInfoBarDelegate* infobar = browser()->GetSelectedTabContentsWrapper()-> GetInfoBarDelegateAt(0)->AsTranslateInfoBarDelegate(); diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index e9734fe..aac9147 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -736,7 +736,7 @@ void AutomationProvider::JavaScriptStressTestControl(int tab_handle, return; } - view->Send(new ViewMsg_JavaScriptStressTestControl( + view->Send(new ChromeViewMsg_JavaScriptStressTestControl( view->routing_id(), cmd, param)); } diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc index 997cfe0..e0ea7f5 100644 --- a/chrome/browser/automation/automation_provider_win.cc +++ b/chrome/browser/automation/automation_provider_win.cc @@ -424,7 +424,7 @@ void AutomationProvider::OnMessageFromExternalHost(int handle, if (!view_host) return; - view_host->Send(new ViewMsg_HandleMessageFromExternalHost( + view_host->Send(new ChromeViewMsg_HandleMessageFromExternalHost( view_host->routing_id(), message, origin, target)); } diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index d4738f5..0c36efc 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -6140,7 +6140,7 @@ void TestingAutomationProvider::LoadBlockedPlugins(int tab_handle, if (!contents) return; RenderViewHost* host = contents->render_view_host(); - host->Send(new ViewMsg_LoadBlockedPlugins(host->routing_id())); + host->Send(new ChromeViewMsg_LoadBlockedPlugins(host->routing_id())); *success = true; } } diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index c4158c2..9f6a753 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -772,7 +772,7 @@ std::string AboutTcmalloc() { AboutTcmallocOutputs::GetInstance()->SetOutput(browser, buffer); RenderProcessHost::iterator it(RenderProcessHost::AllHostsIterator()); while (!it.IsAtEnd()) { - it.GetCurrentValue()->Send(new ViewMsg_GetRendererTcmalloc); + it.GetCurrentValue()->Send(new ChromeViewMsg_GetRendererTcmalloc); it.Advance(); } diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index e89776d..8c6aeaf 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -121,7 +121,8 @@ void ChromeContentBrowserClient::BrowserRenderProcessHostCreated( host->channel()->AddFilter(new TextInputClientMessageFilter(host->id())); #endif - host->Send(new ViewMsg_SetIsIncognitoProcess(profile->IsOffTheRecord())); + host->Send(new ChromeViewMsg_SetIsIncognitoProcess( + profile->IsOffTheRecord())); } void ChromeContentBrowserClient::PluginProcessHostCreated( diff --git a/chrome/browser/chromeos/login/image_decoder.cc b/chrome/browser/chromeos/login/image_decoder.cc index 3c99391..a671ab7 100644 --- a/chrome/browser/chromeos/login/image_decoder.cc +++ b/chrome/browser/chromeos/login/image_decoder.cc @@ -34,9 +34,10 @@ void ImageDecoder::Start() { bool ImageDecoder::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(ImageDecoder, message) - IPC_MESSAGE_HANDLER(UtilityHostMsg_DecodeImage_Succeeded, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Succeeded, OnDecodeImageSucceeded) - IPC_MESSAGE_HANDLER(UtilityHostMsg_DecodeImage_Failed, OnDecodeImageFailed) + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Failed, + OnDecodeImageFailed) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP_EX() return handled; @@ -60,7 +61,7 @@ void ImageDecoder::DecodeImageInSandbox( UtilityProcessHost* utility_process_host = new UtilityProcessHost(this, target_thread_id_); - utility_process_host->Send(new UtilityMsg_DecodeImage(image_data)); + utility_process_host->Send(new ChromeUtilityMsg_DecodeImage(image_data)); } } // namespace chromeos diff --git a/chrome/browser/chromeos/status/memory_menu_button.cc b/chrome/browser/chromeos/status/memory_menu_button.cc index d9d1190..02f3495 100644 --- a/chrome/browser/chromeos/status/memory_menu_button.cc +++ b/chrome/browser/chromeos/status/memory_menu_button.cc @@ -152,11 +152,11 @@ void MemoryMenuButton::SendCommandToRenderers(int id) { !it.IsAtEnd(); it.Advance()) { switch (id) { case TOGGLE_PROFILING_ITEM: - it.GetCurrentValue()->Send(new ViewMsg_SetTcmallocHeapProfiling( + it.GetCurrentValue()->Send(new ChromeViewMsg_SetTcmallocHeapProfiling( started, std::string(kProfileDumpFilePrefix))); break; case DUMP_PROFILING_ITEM: - it.GetCurrentValue()->Send(new ViewMsg_WriteTcmallocHeapProfile( + it.GetCurrentValue()->Send(new ChromeViewMsg_WriteTcmallocHeapProfile( GetProfileDumpFilePath( base::GetProcId(it.GetCurrentValue()->GetHandle())))); break; diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc index 3c0b774..8a753db 100644 --- a/chrome/browser/component_updater/component_updater_service.cc +++ b/chrome/browser/component_updater/component_updater_service.cc @@ -210,9 +210,9 @@ class CrxUpdateService : public ComponentUpdateService { virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { bool handled = true; IPC_BEGIN_MESSAGE_MAP(ManifestParserBridge, message) - IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseUpdateManifest_Succeeded, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseUpdateManifest_Succeeded, OnParseUpdateManifestSucceeded) - IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseUpdateManifest_Failed, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseUpdateManifest_Failed, OnParseUpdateManifestFailed) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -561,7 +561,7 @@ void CrxUpdateService::ParseManifest(const std::string& xml) { UtilityProcessHost* host = new UtilityProcessHost(new ManifestParserBridge(this), BrowserThread::UI); - host->Send(new UtilityMsg_ParseUpdateManifest(xml)); + host->Send(new ChromeUtilityMsg_ParseUpdateManifest(xml)); } } diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc index 51c9359..8549430 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc @@ -407,7 +407,7 @@ bool TabSpecificContentSettings::OnMessageReceived( const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(TabSpecificContentSettings, message) - IPC_MESSAGE_HANDLER(ViewHostMsg_ContentBlocked, OnContentBlocked) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ContentBlocked, OnContentBlocked) IPC_MESSAGE_HANDLER(ViewHostMsg_AppCacheAccessed, OnAppCacheAccessed) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -429,7 +429,7 @@ void TabSpecificContentSettings::RenderViewCreated( Profile* profile = Profile::FromBrowserContext(tab_contents()->browser_context()); HostContentSettingsMap* map = profile->GetHostContentSettingsMap(); - render_view_host->Send(new ViewMsg_SetDefaultContentSettings( + render_view_host->Send(new ChromeViewMsg_SetDefaultContentSettings( map->GetDefaultContentSettings())); } @@ -468,9 +468,9 @@ void TabSpecificContentSettings::Observe(int type, Profile* profile = Profile::FromBrowserContext(tab_contents()->browser_context()); HostContentSettingsMap* map = profile->GetHostContentSettingsMap(); - Send(new ViewMsg_SetDefaultContentSettings( + Send(new ChromeViewMsg_SetDefaultContentSettings( map->GetDefaultContentSettings())); - Send(new ViewMsg_SetContentSettingsForCurrentURL( + Send(new ChromeViewMsg_SetContentSettingsForCurrentURL( entry_url, map->GetContentSettings(entry_url, entry_url))); } } diff --git a/chrome/browser/extensions/extension_management_api.cc b/chrome/browser/extensions/extension_management_api.cc index e69a626..7c669c9 100644 --- a/chrome/browser/extensions/extension_management_api.cc +++ b/chrome/browser/extensions/extension_management_api.cc @@ -209,15 +209,16 @@ class SafeManifestJSONParser : public UtilityProcessHost::Client { void StartWorkOnIOThread() { CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); utility_host_ = new UtilityProcessHost(this, BrowserThread::IO); - utility_host_->Send(new UtilityMsg_ParseJSON(manifest_)); + utility_host_->Send(new ChromeUtilityMsg_ParseJSON(manifest_)); } virtual bool OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(SafeManifestJSONParser, message) - IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseJSON_Succeeded, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Succeeded, OnJSONParseSucceeded) - IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseJSON_Failed, OnJSONParseFailed) + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Failed, + OnJSONParseFailed) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index 32679af..5b3c4bf 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/chrome/browser/extensions/extension_updater.cc @@ -642,7 +642,7 @@ class SafeManifestParser : public UtilityProcessHost::Client { if (use_utility_process) { UtilityProcessHost* host = new UtilityProcessHost( this, BrowserThread::UI); - host->Send(new UtilityMsg_ParseUpdateManifest(xml_)); + host->Send(new ChromeUtilityMsg_ParseUpdateManifest(xml_)); } else { UpdateManifest manifest; if (manifest.Parse(xml_)) { @@ -669,9 +669,9 @@ class SafeManifestParser : public UtilityProcessHost::Client { virtual bool OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(SafeManifestParser, message) - IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseUpdateManifest_Succeeded, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseUpdateManifest_Succeeded, OnParseUpdateManifestSucceeded) - IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseUpdateManifest_Failed, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseUpdateManifest_Failed, OnParseUpdateManifestFailed) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() diff --git a/chrome/browser/extensions/extension_webstore_private_api.cc b/chrome/browser/extensions/extension_webstore_private_api.cc index 0f56c34..90c2741 100644 --- a/chrome/browser/extensions/extension_webstore_private_api.cc +++ b/chrome/browser/extensions/extension_webstore_private_api.cc @@ -184,21 +184,22 @@ class SafeBeginInstallHelper : public UtilityProcessHost::Client { if (icon_data_.empty()) icon_decode_complete_ = true; else - utility_host_->Send(new UtilityMsg_DecodeImageBase64(icon_data_)); - utility_host_->Send(new UtilityMsg_ParseJSON(manifest_)); + utility_host_->Send(new ChromeUtilityMsg_DecodeImageBase64(icon_data_)); + utility_host_->Send(new ChromeUtilityMsg_ParseJSON(manifest_)); } // Implementing pieces of the UtilityProcessHost::Client interface. virtual bool OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(SafeBeginInstallHelper, message) - IPC_MESSAGE_HANDLER(UtilityHostMsg_DecodeImage_Succeeded, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Succeeded, OnDecodeImageSucceeded) - IPC_MESSAGE_HANDLER(UtilityHostMsg_DecodeImage_Failed, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Failed, OnDecodeImageFailed) - IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseJSON_Succeeded, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Succeeded, OnJSONParseSucceeded) - IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseJSON_Failed, OnJSONParseFailed) + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Failed, + OnJSONParseFailed) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc index 3a835d3..967f8fb 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc @@ -234,9 +234,9 @@ bool SandboxedExtensionUnpacker::OnMessageReceived( const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(SandboxedExtensionUnpacker, message) - IPC_MESSAGE_HANDLER(UtilityHostMsg_UnpackExtension_Succeeded, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_UnpackExtension_Succeeded, OnUnpackExtensionSucceeded) - IPC_MESSAGE_HANDLER(UtilityHostMsg_UnpackExtension_Failed, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_UnpackExtension_Failed, OnUnpackExtensionFailed) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -262,7 +262,7 @@ void SandboxedExtensionUnpacker::StartProcessOnIOThread( // Grant the subprocess access to the entire subdir the extension file is // in, so that it can unpack to that dir. host->set_exposed_dir(temp_crx_path.DirName()); - host->Send(new UtilityMsg_UnpackExtension(temp_crx_path)); + host->Send(new ChromeUtilityMsg_UnpackExtension(temp_crx_path)); } void SandboxedExtensionUnpacker::OnUnpackExtensionSucceeded( diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 5f74c68..aa66e70 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -737,7 +737,7 @@ void ExternalTabContainer::ShowRepostFormWarningDialog( bool ExternalTabContainer::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(ExternalTabContainer, message) - IPC_MESSAGE_HANDLER(ViewHostMsg_ForwardMessageToExternalHost, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ForwardMessageToExternalHost, OnForwardMessageToExternalHost) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc index a081ba8..d1c8d68 100644 --- a/chrome/browser/history/history_tab_helper.cc +++ b/chrome/browser/history/history_tab_helper.cc @@ -67,8 +67,8 @@ HistoryTabHelper::CreateHistoryAddPageArgs( bool HistoryTabHelper::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(HistoryTabHelper, message) - IPC_MESSAGE_HANDLER(ViewHostMsg_PageContents, OnPageContents) - IPC_MESSAGE_HANDLER(ViewHostMsg_Thumbnail, OnThumbnail) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_PageContents, OnPageContents) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_Thumbnail, OnThumbnail) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 4386af0..da42231 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -130,7 +130,7 @@ void InstantLoader::FrameLoadObserver::Observe( // TODO: support real cursor position. int text_length = static_cast<int>(text_.size()); RenderViewHost* host = tab_contents_->render_view_host(); - host->Send(new ViewMsg_DetermineIfPageSupportsInstant( + host->Send(new ChromeViewMsg_DetermineIfPageSupportsInstant( host->routing_id(), text_, verbatim_, text_length, text_length)); break; } @@ -508,8 +508,8 @@ bool InstantLoader::TabContentsDelegateImpl::OnMessageReceived( const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(TabContentsDelegateImpl, message) - IPC_MESSAGE_HANDLER(ViewHostMsg_SetSuggestions, OnSetSuggestions) - IPC_MESSAGE_HANDLER(ViewHostMsg_InstantSupportDetermined, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SetSuggestions, OnSetSuggestions) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_InstantSupportDetermined, OnInstantSupportDetermined) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -639,7 +639,7 @@ bool InstantLoader::Update(TabContentsWrapper* tab_contents, // TODO: support real cursor position. int text_length = static_cast<int>(user_text_.size()); RenderViewHost* host = preview_contents_->render_view_host(); - host->Send(new ViewMsg_SearchBoxChange( + host->Send(new ChromeViewMsg_SearchBoxChange( host->routing_id(), user_text_, verbatim, text_length, text_length)); string16 complete_suggested_text_lower = base::i18n::ToLower( @@ -708,9 +708,9 @@ TabContentsWrapper* InstantLoader::ReleasePreviewContents( if (type != INSTANT_COMMIT_DESTROY && is_showing_instant()) { RenderViewHost* host = preview_contents_->render_view_host(); if (type == INSTANT_COMMIT_FOCUS_LOST) { - host->Send(new ViewMsg_SearchBoxCancel(host->routing_id())); + host->Send(new ChromeViewMsg_SearchBoxCancel(host->routing_id())); } else { - host->Send(new ViewMsg_SearchBoxSubmit( + host->Send(new ChromeViewMsg_SearchBoxSubmit( host->routing_id(), user_text_, type == INSTANT_COMMIT_PRESSED_ENTER)); } @@ -923,7 +923,7 @@ void InstantLoader::SendBoundsToPage(bool force_if_waiting) { (force_if_waiting || !is_waiting_for_load())) { last_omnibox_bounds_ = omnibox_bounds_; RenderViewHost* host = preview_contents_->render_view_host(); - host->Send(new ViewMsg_SearchBoxResize( + host->Send(new ChromeViewMsg_SearchBoxResize( host->routing_id(), GetOmniboxBoundsInTermsOfPreview())); } } @@ -1030,7 +1030,7 @@ void InstantLoader::LoadInstantURL(TabContentsWrapper* tab_contents, instant_url = GURL(cl->GetSwitchValueASCII(switches::kInstantURL)); preview_contents_->controller().LoadURL(instant_url, GURL(), transition_type); RenderViewHost* host = preview_contents_->render_view_host(); - host->Send(new ViewMsg_SearchBoxChange( + host->Send(new ChromeViewMsg_SearchBoxChange( host->routing_id(), user_text, verbatim, 0, 0)); frame_load_observer_.reset(new FrameLoadObserver( this, preview_contents()->tab_contents(), user_text, verbatim)); diff --git a/chrome/browser/memory_purger.cc b/chrome/browser/memory_purger.cc index f728447..8f0546d 100644 --- a/chrome/browser/memory_purger.cc +++ b/chrome/browser/memory_purger.cc @@ -152,5 +152,5 @@ void MemoryPurger::PurgeRenderers() { // static void MemoryPurger::PurgeRendererForHost(RenderProcessHost* host) { // Direct the renderer to free everything it can. - host->Send(new ViewMsg_PurgeMemory()); + host->Send(new ChromeViewMsg_PurgeMemory()); } diff --git a/chrome/browser/metrics/field_trial_synchronizer.cc b/chrome/browser/metrics/field_trial_synchronizer.cc index 0e7484f..7a04701 100644 --- a/chrome/browser/metrics/field_trial_synchronizer.cc +++ b/chrome/browser/metrics/field_trial_synchronizer.cc @@ -32,7 +32,7 @@ void FieldTrialSynchronizer::NotifyAllRenderers( for (RenderProcessHost::iterator it(RenderProcessHost::AllHostsIterator()); !it.IsAtEnd(); it.Advance()) { it.GetCurrentValue()->Send( - new ViewMsg_SetFieldTrialGroup(field_trial_name, group_name)); + new ChromeViewMsg_SetFieldTrialGroup(field_trial_name, group_name)); } } diff --git a/chrome/browser/metrics/histogram_synchronizer.cc b/chrome/browser/metrics/histogram_synchronizer.cc index c180112..8edf732 100644 --- a/chrome/browser/metrics/histogram_synchronizer.cc +++ b/chrome/browser/metrics/histogram_synchronizer.cc @@ -142,7 +142,7 @@ int HistogramSynchronizer::NotifyAllRenderers( for (RenderProcessHost::iterator it(RenderProcessHost::AllHostsIterator()); !it.IsAtEnd(); it.Advance()) { if (!it.GetCurrentValue()->Send( - new ViewMsg_GetRendererHistograms(sequence_number))) + new ChromeViewMsg_GetRendererHistograms(sequence_number))) DecrementPendingRenderers(sequence_number); } diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index aec969f..21a9f63 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -949,7 +949,7 @@ void MetricsService::StartScheduledUpload() { // Collect WebCore cache information to put into a histogram. for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator()); !i.IsAtEnd(); i.Advance()) - i.GetCurrentValue()->Send(new ViewMsg_GetCacheResourceStats()); + i.GetCurrentValue()->Send(new ChromeViewMsg_GetCacheResourceStats()); } void MetricsService::OnMemoryDetailCollectionDone() { diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 6922128..39a2f37 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -308,7 +308,7 @@ void NaClProcessHost::OpenIrtFileDone(base::PlatformFileError error_code, // Get the pid of the NaCl process base::ProcessId nacl_process_id = base::GetProcId(handle()); - ViewHostMsg_LaunchNaCl::WriteReplyParams( + ChromeViewHostMsg_LaunchNaCl::WriteReplyParams( reply_msg_, handles_for_renderer, nacl_process_handle, nacl_process_id); chrome_render_message_filter_->Send(reply_msg_); chrome_render_message_filter_ = NULL; diff --git a/chrome/browser/plugin_observer.cc b/chrome/browser/plugin_observer.cc index 0519d8a..4555ff8 100644 --- a/chrome/browser/plugin_observer.cc +++ b/chrome/browser/plugin_observer.cc @@ -65,7 +65,7 @@ PluginInfoBarDelegate::~PluginInfoBarDelegate() { } bool PluginInfoBarDelegate::Cancel() { - tab_contents_->render_view_host()->Send(new ViewMsg_LoadBlockedPlugins( + tab_contents_->render_view_host()->Send(new ChromeViewMsg_LoadBlockedPlugins( tab_contents_->render_view_host()->routing_id())); return true; } @@ -296,7 +296,7 @@ bool PluginObserver::OnMessageReceived(const IPC::Message& message) { IPC_BEGIN_MESSAGE_MAP(PluginObserver, message) IPC_MESSAGE_HANDLER(ViewHostMsg_MissingPluginStatus, OnMissingPluginStatus) IPC_MESSAGE_HANDLER(ViewHostMsg_CrashedPlugin, OnCrashedPlugin) - IPC_MESSAGE_HANDLER(ViewHostMsg_BlockedOutdatedPlugin, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_BlockedOutdatedPlugin, OnBlockedOutdatedPlugin) IPC_MESSAGE_UNHANDLED(return false) IPC_END_MESSAGE_MAP() diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index 0ff0e31..f983347 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -378,8 +378,9 @@ void PrerenderContents::Observe(int type, // first navigation, so there's no need to send the message just after // the TabContents is created. new_render_view_host->Send( - new ViewMsg_SetIsPrerendering(new_render_view_host->routing_id(), - true)); + new ChromeViewMsg_SetIsPrerendering( + new_render_view_host->routing_id(), + true)); } break; } diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 1b2567c..8ba0788 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -482,7 +482,8 @@ bool PrerenderManager::MaybeUsePrerenderedPage(TabContents* tab_contents, prerender_contents->prerender_contents()->render_view_host(); DCHECK(render_view_host); render_view_host->Send( - new ViewMsg_SetIsPrerendering(render_view_host->routing_id(), false)); + new ChromeViewMsg_SetIsPrerendering(render_view_host->routing_id(), + false)); TabContentsWrapper* new_tab_contents = prerender_contents->ReleasePrerenderContents(); diff --git a/chrome/browser/prerender/prerender_render_view_host_observer.cc b/chrome/browser/prerender/prerender_render_view_host_observer.cc index 0589fff..42756b0 100644 --- a/chrome/browser/prerender/prerender_render_view_host_observer.cc +++ b/chrome/browser/prerender/prerender_render_view_host_observer.cc @@ -46,13 +46,13 @@ bool PrerenderRenderViewHostObserver::OnMessageReceived( handled = true; IPC_BEGIN_MESSAGE_MAP(PrerenderRenderViewHostObserver, message) IPC_MESSAGE_HANDLER(IconHostMsg_UpdateFaviconURL, OnUpdateFaviconURL) - IPC_MESSAGE_HANDLER(ViewHostMsg_MaybeCancelPrerenderForHTML5Media, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_MaybeCancelPrerenderForHTML5Media, OnMaybeCancelPrerenderForHTML5Media) IPC_MESSAGE_HANDLER(ViewHostMsg_JSOutOfMemory, OnJSOutOfMemory) IPC_MESSAGE_HANDLER(ViewHostMsg_RunJavaScriptMessage, OnRunJavaScriptMessage) IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewGone, OnRenderViewGone) - IPC_MESSAGE_HANDLER(ViewHostMsg_CancelPrerenderForPrinting, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CancelPrerenderForPrinting, OnCancelPrerenderForPrinting) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc index 5cc1293..b7c864d 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc @@ -101,13 +101,16 @@ bool ChromeRenderMessageFilter::OnMessageReceived(const IPC::Message& message, bool* message_was_ok) { bool handled = true; IPC_BEGIN_MESSAGE_MAP_EX(ChromeRenderMessageFilter, message, *message_was_ok) - IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_LaunchNaCl, OnLaunchNaCl) - IPC_MESSAGE_HANDLER(ViewHostMsg_DnsPrefetch, OnDnsPrefetch) - IPC_MESSAGE_HANDLER(ViewHostMsg_RendererHistograms, OnRendererHistograms) - IPC_MESSAGE_HANDLER(ViewHostMsg_ResourceTypeStats, OnResourceTypeStats) - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdatedCacheStats, OnUpdatedCacheStats) + IPC_MESSAGE_HANDLER_DELAY_REPLY(ChromeViewHostMsg_LaunchNaCl, OnLaunchNaCl) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DnsPrefetch, OnDnsPrefetch) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RendererHistograms, + OnRendererHistograms) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ResourceTypeStats, + OnResourceTypeStats) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_UpdatedCacheStats, + OnUpdatedCacheStats) IPC_MESSAGE_HANDLER(ViewHostMsg_FPS, OnFPS) - IPC_MESSAGE_HANDLER(ViewHostMsg_V8HeapStats, OnV8HeapStats) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_V8HeapStats, OnV8HeapStats) IPC_MESSAGE_HANDLER(ExtensionHostMsg_OpenChannelToExtension, OnOpenChannelToExtension) IPC_MESSAGE_HANDLER(ExtensionHostMsg_OpenChannelToTab, OnOpenChannelToTab) @@ -120,20 +123,21 @@ bool ChromeRenderMessageFilter::OnMessageReceived(const IPC::Message& message, IPC_MESSAGE_HANDLER(ExtensionHostMsg_RequestForIOThread, OnExtensionRequestForIOThread) #if defined(USE_TCMALLOC) - IPC_MESSAGE_HANDLER(ViewHostMsg_RendererTcmalloc, OnRendererTcmalloc) - IPC_MESSAGE_HANDLER(ViewHostMsg_WriteTcmallocHeapProfile_ACK, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RendererTcmalloc, OnRendererTcmalloc) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_WriteTcmallocHeapProfile_ACK, OnWriteTcmallocHeapProfile) #endif - IPC_MESSAGE_HANDLER(ViewHostMsg_GetPluginPolicies, OnGetPluginPolicies) - IPC_MESSAGE_HANDLER(ViewHostMsg_AllowDatabase, OnAllowDatabase) - IPC_MESSAGE_HANDLER(ViewHostMsg_AllowDOMStorage, OnAllowDOMStorage) - IPC_MESSAGE_HANDLER(ViewHostMsg_AllowFileSystem, OnAllowFileSystem) - IPC_MESSAGE_HANDLER(ViewHostMsg_AllowIndexedDB, OnAllowIndexedDB) - IPC_MESSAGE_HANDLER(ViewHostMsg_GetPluginContentSetting, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_GetPluginPolicies, + OnGetPluginPolicies) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowDatabase, OnAllowDatabase) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowDOMStorage, OnAllowDOMStorage) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowFileSystem, OnAllowFileSystem) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowIndexedDB, OnAllowIndexedDB) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_GetPluginContentSetting, OnGetPluginContentSetting) - IPC_MESSAGE_HANDLER(ViewHostMsg_CanTriggerClipboardRead, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CanTriggerClipboardRead, OnCanTriggerClipboardRead) - IPC_MESSAGE_HANDLER(ViewHostMsg_CanTriggerClipboardWrite, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CanTriggerClipboardWrite, OnCanTriggerClipboardWrite) IPC_MESSAGE_HANDLER(ViewHostMsg_ClearPredictorCache, OnClearPredictorCache) IPC_MESSAGE_UNHANDLED(handled = false) @@ -168,14 +172,14 @@ void ChromeRenderMessageFilter::OnDestruct() const { void ChromeRenderMessageFilter::OverrideThreadForMessage( const IPC::Message& message, BrowserThread::ID* thread) { switch (message.type()) { - case ViewHostMsg_ResourceTypeStats::ID: + case ChromeViewHostMsg_ResourceTypeStats::ID: #if defined(USE_TCMALLOC) - case ViewHostMsg_RendererTcmalloc::ID: + case ChromeViewHostMsg_RendererTcmalloc::ID: #endif case ExtensionHostMsg_AddListener::ID: case ExtensionHostMsg_RemoveListener::ID: case ExtensionHostMsg_CloseChannel::ID: - case ViewHostMsg_UpdatedCacheStats::ID: + case ChromeViewHostMsg_UpdatedCacheStats::ID: *thread = BrowserThread::UI; break; default: diff --git a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc index 20eb5a5..cc17e66 100644 --- a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc +++ b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc @@ -48,7 +48,7 @@ bool ChromeRenderViewHostObserver::OnMessageReceived( const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(ChromeRenderViewHostObserver, message) - IPC_MESSAGE_HANDLER(ViewHostMsg_DomOperationResponse, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DomOperationResponse, OnDomOperationResponse) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc index b5ecf43..4fe2185 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc @@ -300,7 +300,7 @@ void ChromeResourceDispatcherHostDelegate::OnResponseStarted( ResourceDispatcherHostRequestInfo* info = resource_dispatcher_host_->InfoForRequest(request); - filter->Send(new ViewMsg_SetContentSettingsForLoadingURL( + filter->Send(new ChromeViewMsg_SetContentSettingsForLoadingURL( info->route_id(), request->url(), map->GetContentSettings(request->url(), request->url()))); diff --git a/chrome/browser/renderer_host/web_cache_manager.cc b/chrome/browser/renderer_host/web_cache_manager.cc index 2574ad3..5a3a0ff 100644 --- a/chrome/browser/renderer_host/web_cache_manager.cc +++ b/chrome/browser/renderer_host/web_cache_manager.cc @@ -313,9 +313,9 @@ void WebCacheManager::EnactStrategy(const AllocationStrategy& strategy) { // capacity lower. size_t max_dead_capacity = capacity; - host->Send(new ViewMsg_SetCacheCapacities(min_dead_capacity, - max_dead_capacity, - capacity)); + host->Send(new ChromeViewMsg_SetCacheCapacities(min_dead_capacity, + max_dead_capacity, + capacity)); } ++allocation; } @@ -326,7 +326,7 @@ void WebCacheManager::ClearRendederCache(const std::set<int>& renderers) { for (; iter != renderers.end(); ++iter) { RenderProcessHost* host = RenderProcessHost::FromID(*iter); if (host) - host->Send(new ViewMsg_ClearCache()); + host->Send(new ChromeViewMsg_ClearCache()); } } diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc index c3c02ea..9c06275 100644 --- a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc +++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc @@ -41,8 +41,9 @@ bool SearchProviderInstallStateMessageFilter::OnMessageReceived( bool handled = true; IPC_BEGIN_MESSAGE_MAP_EX(SearchProviderInstallStateMessageFilter, message, *message_was_ok) - IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetSearchProviderInstallState, - OnMsgGetSearchProviderInstallState) + IPC_MESSAGE_HANDLER_DELAY_REPLY( + ChromeViewHostMsg_GetSearchProviderInstallState, + OnMsgGetSearchProviderInstallState) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; @@ -101,7 +102,7 @@ void SearchProviderInstallStateMessageFilter::ReplyWithProviderInstallState( search_provider::InstallState install_state = GetSearchProviderInstallState(page_location, requested_host); - ViewHostMsg_GetSearchProviderInstallState::WriteReplyParams( + ChromeViewHostMsg_GetSearchProviderInstallState::WriteReplyParams( reply_msg, install_state); Send(reply_msg); diff --git a/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc b/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc index 590bc14..9b0efe3 100644 --- a/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc +++ b/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc @@ -67,8 +67,8 @@ bool InsecureContentInfoBarDelegate::Cancel() { int32 routing_id = tab_contents_->routing_id(); tab_contents_->Send((type_ == DISPLAY) ? static_cast<IPC::Message*>( - new ViewMsg_SetAllowDisplayingInsecureContent(routing_id, true)) : - new ViewMsg_SetAllowRunningInsecureContent(routing_id, true)); + new ChromeViewMsg_SetAllowDisplayingInsecureContent(routing_id, true)) : + new ChromeViewMsg_SetAllowRunningInsecureContent(routing_id, true)); return true; } diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index c404fc42..6fdb578 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -109,7 +109,7 @@ TaskManagerRendererResource::~TaskManagerRendererResource() { void TaskManagerRendererResource::Refresh() { if (!pending_stats_update_) { - render_view_host_->Send(new ViewMsg_GetCacheResourceStats); + render_view_host_->Send(new ChromeViewMsg_GetCacheResourceStats); pending_stats_update_ = true; } if (!pending_fps_update_) { @@ -118,7 +118,7 @@ void TaskManagerRendererResource::Refresh() { pending_fps_update_ = true; } if (!pending_v8_memory_allocated_update_) { - render_view_host_->Send(new ViewMsg_GetV8HeapStats); + render_view_host_->Send(new ChromeViewMsg_GetV8HeapStats); pending_v8_memory_allocated_update_ = true; } } diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 66c91e8..1310c8e 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -564,7 +564,7 @@ void TranslateManager::RevertTranslation(TabContents* tab_contents) { NOTREACHED(); return; } - tab_contents->render_view_host()->Send(new ViewMsg_RevertTranslation( + tab_contents->render_view_host()->Send(new ChromeViewMsg_RevertTranslation( tab_contents->render_view_host()->routing_id(), entry->page_id())); TranslateTabHelper* helper = TabContentsWrapper::GetCurrentWrapperForContents( @@ -616,7 +616,7 @@ void TranslateManager::DoTranslatePage(TabContents* tab, wrapper->translate_tab_helper()->language_state().set_translation_pending( true); - tab->render_view_host()->Send(new ViewMsg_TranslatePage( + tab->render_view_host()->Send(new ChromeViewMsg_TranslatePage( tab->render_view_host()->routing_id(), entry->page_id(), translate_script, source_lang, target_lang)); diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index a589f7a..da6dbf9 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -63,7 +63,7 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness, void SimulateOnTranslateLanguageDetermined(const std::string& lang, bool page_translatable) { - rvh()->TestOnMessageReceived(ViewHostMsg_TranslateLanguageDetermined( + rvh()->TestOnMessageReceived(ChromeViewHostMsg_TranslateLanguageDetermined( 0, lang, page_translatable)); } @@ -71,11 +71,12 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness, std::string* original_lang, std::string* target_lang) { const IPC::Message* message = - process()->sink().GetFirstMessageMatching(ViewMsg_TranslatePage::ID); + process()->sink().GetFirstMessageMatching( + ChromeViewMsg_TranslatePage::ID); if (!message) return false; Tuple4<int, std::string, std::string, std::string> translate_param; - ViewMsg_TranslatePage::Read(message, &translate_param); + ChromeViewMsg_TranslatePage::Read(message, &translate_param); if (page_id) *page_id = translate_param.a; // Ignore translate_param.b which is the script injected in the page. @@ -340,8 +341,8 @@ TEST_F(TranslateManagerTest, NormalTranslate) { EXPECT_EQ("en", target_lang); // Simulate the render notifying the translation has been done. - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, "fr", "en", - TranslateErrors::NONE)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // The after translate infobar should be showing. infobar = GetTranslateInfoBar(); @@ -356,8 +357,8 @@ TEST_F(TranslateManagerTest, NormalTranslate) { EXPECT_EQ(new_original_lang, original_lang); EXPECT_EQ("en", target_lang); // Simulate the render notifying the translation has been done. - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, - new_original_lang, "en", TranslateErrors::NONE)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 0, 0, new_original_lang, "en", TranslateErrors::NONE)); // infobar is now invalid. TranslateInfoBarDelegate* new_infobar = GetTranslateInfoBar(); ASSERT_TRUE(new_infobar != NULL); @@ -371,7 +372,7 @@ TEST_F(TranslateManagerTest, NormalTranslate) { EXPECT_EQ(new_original_lang, original_lang); EXPECT_EQ(new_target_lang, target_lang); // Simulate the render notifying the translation has been done. - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated(0, 0, new_original_lang, new_target_lang, TranslateErrors::NONE)); // infobar is now invalid. new_infobar = GetTranslateInfoBar(); @@ -430,8 +431,8 @@ TEST_F(TranslateManagerTest, TranslateUnknownLanguage) { // Simulate the render notifying the translation has been done, the server // having detected the page was in a known and supported language. - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, "fr", "en", - TranslateErrors::NONE)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // The after translate infobar should be showing. infobar = GetTranslateInfoBar(); @@ -446,8 +447,8 @@ TEST_F(TranslateManagerTest, TranslateUnknownLanguage) { menu.reset(TestRenderViewContextMenu::CreateContextMenu(contents())); menu->Init(); menu->ExecuteCommand(IDC_CONTENT_CONTEXT_TRANSLATE); - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(1, 0, "en", "en", - TranslateErrors::IDENTICAL_LANGUAGES)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 1, 0, "en", "en", TranslateErrors::IDENTICAL_LANGUAGES)); infobar = GetTranslateInfoBar(); ASSERT_TRUE(infobar != NULL); EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATION_ERROR, infobar->type()); @@ -459,8 +460,8 @@ TEST_F(TranslateManagerTest, TranslateUnknownLanguage) { menu.reset(TestRenderViewContextMenu::CreateContextMenu(contents())); menu->Init(); menu->ExecuteCommand(IDC_CONTENT_CONTEXT_TRANSLATE); - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(2, 0, "", "en", - TranslateErrors::UNKNOWN_LANGUAGE)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 2, 0, "", "en", TranslateErrors::UNKNOWN_LANGUAGE)); infobar = GetTranslateInfoBar(); ASSERT_TRUE(infobar != NULL); EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATION_ERROR, infobar->type()); @@ -601,8 +602,8 @@ TEST_F(TranslateManagerTest, AutoTranslateOnNavigate) { // Simulate the translate script being retrieved. SimulateTranslateScriptURLFetch(true); - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, "fr", "en", - TranslateErrors::NONE)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // Now navigate to a new page in the same language. process()->sink().ClearMessages(); @@ -773,8 +774,8 @@ TEST_F(TranslateManagerTest, TranslateCloseInfoBarInPageNavigation) { infobar->Translate(); // Simulate the translate script being retrieved. SimulateTranslateScriptURLFetch(true); - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, "fr", "en", - TranslateErrors::NONE)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // Close the infobar. EXPECT_TRUE(CloseTranslateInfoBar()); @@ -803,8 +804,8 @@ TEST_F(TranslateManagerTest, TranslateInPageNavigation) { infobar->Translate(); // Simulate the translate script being retrieved. SimulateTranslateScriptURLFetch(true); - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, "fr", "en", - TranslateErrors::NONE)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // The after translate infobar is showing. infobar = GetTranslateInfoBar(); ASSERT_TRUE(infobar != NULL); @@ -842,8 +843,8 @@ TEST_F(TranslateManagerTest, ServerReportsUnsupportedLanguage) { SimulateTranslateScriptURLFetch(true); // Simulate the render notifying the translation has been done, but it // reports a language we don't support. - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, "qbz", "en", - TranslateErrors::NONE)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 0, 0, "qbz", "en", TranslateErrors::NONE)); // An error infobar should be showing to report that we don't support this // language. @@ -858,7 +859,8 @@ TEST_F(TranslateManagerTest, ServerReportsUnsupportedLanguage) { process()->sink().ClearMessages(); infobar->MessageInfoBarButtonPressed(); const IPC::Message* message = - process()->sink().GetFirstMessageMatching(ViewMsg_RevertTranslation::ID); + process()->sink().GetFirstMessageMatching( + ChromeViewMsg_RevertTranslation::ID); EXPECT_TRUE(message != NULL); // And it should have removed the infobar. EXPECT_TRUE(GetTranslateInfoBar() == NULL); @@ -1147,8 +1149,8 @@ TEST_F(TranslateManagerTest, ContextMenu) { EXPECT_FALSE(translate_prefs.IsSiteBlacklisted(url.host())); // Let's simulate the page being translated. - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, "fr", "en", - TranslateErrors::NONE)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // The translate menu should now be disabled. menu.reset(TestRenderViewContextMenu::CreateContextMenu(contents())); @@ -1183,8 +1185,8 @@ TEST_F(TranslateManagerTest, ContextMenu) { menu.reset(TestRenderViewContextMenu::CreateContextMenu(contents())); menu->Init(); EXPECT_TRUE(menu->IsCommandIdEnabled(IDC_CONTENT_CONTEXT_TRANSLATE)); - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, "de", "en", - TranslateErrors::NONE)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 0, 0, "de", "en", TranslateErrors::NONE)); menu->ExecuteCommand(IDC_CONTENT_CONTEXT_TRANSLATE); // No message expected since the translation should have been ignored. EXPECT_FALSE(GetTranslateMessage(&page_id, &original_lang, &target_lang)); @@ -1308,8 +1310,8 @@ TEST_F(TranslateManagerTest, ScriptExpires) { process()->sink().ClearMessages(); infobar->Translate(); SimulateTranslateScriptURLFetch(true); - rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, "fr", "en", - TranslateErrors::NONE)); + rvh()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // A task should have been posted to clear the script, run it. MessageLoop::current()->RunAllPending(); @@ -1323,8 +1325,9 @@ TEST_F(TranslateManagerTest, ScriptExpires) { // If we don't simulate the URL fetch, the TranslateManager should be waiting // for the script and no message should have been sent to the renderer. EXPECT_TRUE( - process()->sink().GetFirstMessageMatching(ViewMsg_TranslatePage::ID) == - NULL); + process()->sink().GetFirstMessageMatching( + ChromeViewMsg_TranslatePage::ID) == + NULL); // Now simulate the URL fetch. SimulateTranslateScriptURLFetch(true); // Now the message should have been sent. diff --git a/chrome/browser/translate/translate_tab_helper.cc b/chrome/browser/translate/translate_tab_helper.cc index efd82c3..b4a1018 100644 --- a/chrome/browser/translate/translate_tab_helper.cc +++ b/chrome/browser/translate/translate_tab_helper.cc @@ -21,9 +21,9 @@ TranslateTabHelper::~TranslateTabHelper() { bool TranslateTabHelper::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(TranslateTabHelper, message) - IPC_MESSAGE_HANDLER(ViewHostMsg_TranslateLanguageDetermined, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_TranslateLanguageDetermined, OnLanguageDetermined) - IPC_MESSAGE_HANDLER(ViewHostMsg_PageTranslated, OnPageTranslated) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_PageTranslated, OnPageTranslated) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc index c54a5d7..fa18272 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc @@ -354,7 +354,7 @@ class ContentSettingPluginBubbleModel : public ContentSettingSingleRadioGroup { UserMetrics::RecordAction(UserMetricsAction("ClickToPlay_LoadAll_Bubble")); DCHECK(tab_contents()); RenderViewHost* host = tab_contents()->render_view_host(); - host->Send(new ViewMsg_LoadBlockedPlugins(host->routing_id())); + host->Send(new ChromeViewMsg_LoadBlockedPlugins(host->routing_id())); set_custom_link_enabled(false); tab_contents()->content_settings()->set_load_plugins_link_enabled(false); } diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc index 5a9772db..9a67565 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc @@ -41,7 +41,7 @@ void SearchEngineTabHelper::DidNavigateMainFramePostCommit( bool SearchEngineTabHelper::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(SearchEngineTabHelper, message) - IPC_MESSAGE_HANDLER(ViewHostMsg_PageHasOSDD, OnPageHasOSDD) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_PageHasOSDD, OnPageHasOSDD) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc index 28d7f0b..f1528db 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc +++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc @@ -366,7 +366,7 @@ TabContentsWrapper* TabContentsWrapper::Clone() { } void TabContentsWrapper::CaptureSnapshot() { - Send(new ViewMsg_CaptureSnapshot(routing_id())); + Send(new ChromeViewMsg_CaptureSnapshot(routing_id())); } // static @@ -426,12 +426,12 @@ bool TabContentsWrapper::OnMessageReceived(const IPC::Message& message) { OnRegisterIntentHandler) IPC_MESSAGE_HANDLER(ViewHostMsg_WebIntentDispatch, OnWebIntentDispatch) - IPC_MESSAGE_HANDLER(ViewHostMsg_Snapshot, OnSnapshot) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_Snapshot, OnSnapshot) IPC_MESSAGE_HANDLER(ViewHostMsg_PDFHasUnsupportedFeature, OnPDFHasUnsupportedFeature) - IPC_MESSAGE_HANDLER(ViewHostMsg_DidBlockDisplayingInsecureContent, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidBlockDisplayingInsecureContent, OnDidBlockDisplayingInsecureContent) - IPC_MESSAGE_HANDLER(ViewHostMsg_DidBlockRunningInsecureContent, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidBlockRunningInsecureContent, OnDidBlockRunningInsecureContent) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -724,7 +724,8 @@ void TabContentsWrapper::UpdateSafebrowsingDetectionHost() { safebrowsing_detection_host_.reset(); } render_view_host()->Send( - new ViewMsg_SetClientSidePhishingDetection(routing_id(), safe_browsing)); + new ChromeViewMsg_SetClientSidePhishingDetection(routing_id(), + safe_browsing)); #endif } diff --git a/chrome/browser/ui/webui/web_ui_test_handler.cc b/chrome/browser/ui/webui/web_ui_test_handler.cc index 460c22e..0767583 100644 --- a/chrome/browser/ui/webui/web_ui_test_handler.cc +++ b/chrome/browser/ui/webui/web_ui_test_handler.cc @@ -24,7 +24,7 @@ WebUITestHandler::WebUITestHandler() void WebUITestHandler::PreloadJavaScript(const string16& js_text, RenderViewHost* preload_host) { DCHECK(preload_host); - preload_host->Send(new ViewMsg_WebUIJavaScript( + preload_host->Send(new ChromeViewMsg_WebUIJavaScript( preload_host->routing_id(), string16(), js_text, 0, false)); } diff --git a/chrome/browser/visitedlink/visitedlink_event_listener.cc b/chrome/browser/visitedlink/visitedlink_event_listener.cc index c8020dc..478faac 100644 --- a/chrome/browser/visitedlink/visitedlink_event_listener.cc +++ b/chrome/browser/visitedlink/visitedlink_event_listener.cc @@ -47,7 +47,8 @@ class VisitedLinkUpdater { base::SharedMemoryHandle handle_for_process; table_memory->ShareToProcess(process->GetHandle(), &handle_for_process); if (base::SharedMemory::IsHandleValid(handle_for_process)) - process->Send(new ViewMsg_VisitedLink_NewTable(handle_for_process)); + process->Send(new ChromeViewMsg_VisitedLink_NewTable( + handle_for_process)); } // Buffers |links| to update, but doesn't actually relay them. @@ -83,7 +84,7 @@ class VisitedLinkUpdater { return; if (reset_needed_) { - process->Send(new ViewMsg_VisitedLink_Reset()); + process->Send(new ChromeViewMsg_VisitedLink_Reset()); reset_needed_ = false; return; } @@ -91,7 +92,7 @@ class VisitedLinkUpdater { if (pending_.empty()) return; - process->Send(new ViewMsg_VisitedLink_Add(pending_)); + process->Send(new ChromeViewMsg_VisitedLink_Add(pending_)); pending_.clear(); } diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc index 581852b..36d78c7 100644 --- a/chrome/browser/visitedlink/visitedlink_unittest.cc +++ b/chrome/browser/visitedlink/visitedlink_unittest.cc @@ -528,12 +528,12 @@ class VisitRelayingRenderProcessHost : public BrowserRenderProcessHost { static_cast<VisitCountingProfile*>( Profile::FromBrowserContext(browser_context())); - if (msg->type() == ViewMsg_VisitedLink_Add::ID) { + if (msg->type() == ChromeViewMsg_VisitedLink_Add::ID) { void* iter = NULL; std::vector<uint64> fingerprints; CHECK(IPC::ReadParam(msg, &iter, &fingerprints)); counting_profile->CountAddEvent(fingerprints.size()); - } else if (msg->type() == ViewMsg_VisitedLink_Reset::ID) { + } else if (msg->type() == ChromeViewMsg_VisitedLink_Reset::ID) { counting_profile->CountResetEvent(); } diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 3c84ab3..371a520 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -156,9 +156,9 @@ class WebResourceService::UnpackerClient : public UtilityProcessHost::Client { bool handled = true; IPC_BEGIN_MESSAGE_MAP_EX(WebResourceService::UnpackerClient, message, msg_is_ok) - IPC_MESSAGE_HANDLER(UtilityHostMsg_UnpackWebResource_Succeeded, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_UnpackWebResource_Succeeded, OnUnpackWebResourceSucceeded) - IPC_MESSAGE_HANDLER(UtilityHostMsg_UnpackWebResource_Failed, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_UnpackWebResource_Failed, OnUnpackWebResourceFailed) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP_EX() @@ -197,7 +197,7 @@ class WebResourceService::UnpackerClient : public UtilityProcessHost::Client { UtilityProcessHost* host = new UtilityProcessHost(this, thread_id); // TODO(mrc): get proper file path when we start using web resources // that need to be unpacked. - host->Send(new UtilityMsg_UnpackWebResource(json_data_)); + host->Send(new ChromeUtilityMsg_UnpackWebResource(json_data_)); } scoped_refptr<WebResourceService> web_resource_service_; |