diff options
66 files changed, 403 insertions, 364 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_; diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index de094f8..84fe5a4 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -288,7 +288,7 @@ bool ChromeContentClient::CanSendWhileSwappedOut(const IPC::Message* msg) { // Any Chrome-specific messages that must be allowed to be sent from swapped // out renderers. switch (msg->type()) { - case ViewHostMsg_DomOperationResponse::ID: + case ChromeViewHostMsg_DomOperationResponse::ID: return true; default: break; @@ -302,7 +302,7 @@ bool ChromeContentClient::CanHandleWhileSwappedOut( // CanSendWhileSwappedOut) that must be handled by the browser when sent from // swapped out renderers. switch (msg.type()) { - case ViewHostMsg_Snapshot::ID: + case ChromeViewHostMsg_Snapshot::ID: return true; default: break; diff --git a/chrome/common/chrome_utility_messages.h b/chrome/common/chrome_utility_messages.h index d3b7102..c993653 100644 --- a/chrome/common/chrome_utility_messages.h +++ b/chrome/common/chrome_utility_messages.h @@ -52,29 +52,29 @@ IPC_STRUCT_TRAITS_END() // These are messages from the browser to the utility process. // Tell the utility process to unpack the given extension file in its // directory and verify that it is valid. -IPC_MESSAGE_CONTROL1(UtilityMsg_UnpackExtension, +IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_UnpackExtension, FilePath /* extension_filename */) // Tell the utility process to parse the given JSON data and verify its // validity. -IPC_MESSAGE_CONTROL1(UtilityMsg_UnpackWebResource, +IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_UnpackWebResource, std::string /* JSON data */) // Tell the utility process to parse the given xml document. -IPC_MESSAGE_CONTROL1(UtilityMsg_ParseUpdateManifest, +IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_ParseUpdateManifest, std::string /* xml document contents */) // Tell the utility process to decode the given image data. -IPC_MESSAGE_CONTROL1(UtilityMsg_DecodeImage, +IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_DecodeImage, std::vector<unsigned char>) // encoded image contents // Tell the utility process to decode the given image data, which is base64 // encoded. -IPC_MESSAGE_CONTROL1(UtilityMsg_DecodeImageBase64, +IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_DecodeImageBase64, std::string) // base64 encoded image contents // Tell the utility process to render the given PDF into a metafile. -IPC_MESSAGE_CONTROL5(UtilityMsg_RenderPDFPagesToMetafile, +IPC_MESSAGE_CONTROL5(ChromeUtilityMsg_RenderPDFPagesToMetafile, base::PlatformFile, // PDF file FilePath, // Location for output metafile gfx::Rect, // Render Area @@ -82,14 +82,14 @@ IPC_MESSAGE_CONTROL5(UtilityMsg_RenderPDFPagesToMetafile, std::vector<printing::PageRange>) // Tell the utility process to parse a JSON string into a Value object. -IPC_MESSAGE_CONTROL1(UtilityMsg_ParseJSON, +IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_ParseJSON, std::string /* JSON to parse */) // Tells the utility process to get capabilities and defaults for the specified // printer. Used on Windows to isolate the service process from printer driver // crashes by executing this in a separate process. This does not run in a // sandbox. -IPC_MESSAGE_CONTROL1(UtilityMsg_GetPrinterCapsAndDefaults, +IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_GetPrinterCapsAndDefaults, std::string /* printer name */) //------------------------------------------------------------------------------ @@ -100,53 +100,53 @@ IPC_MESSAGE_CONTROL1(UtilityMsg_GetPrinterCapsAndDefaults, // The unpacker should also have written out files containing the decoded // images and message catalogs from the extension. See ExtensionUnpacker for // details. -IPC_MESSAGE_CONTROL1(UtilityHostMsg_UnpackExtension_Succeeded, +IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_UnpackExtension_Succeeded, DictionaryValue /* manifest */) // Reply when the utility process has failed while unpacking an extension. // |error_message| is a user-displayable explanation of what went wrong. -IPC_MESSAGE_CONTROL1(UtilityHostMsg_UnpackExtension_Failed, +IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_UnpackExtension_Failed, std::string /* error_message, if any */) // Reply when the utility process is done unpacking and parsing JSON data // from a web resource. -IPC_MESSAGE_CONTROL1(UtilityHostMsg_UnpackWebResource_Succeeded, +IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_UnpackWebResource_Succeeded, DictionaryValue /* json data */) // Reply when the utility process has failed while unpacking and parsing a // web resource. |error_message| is a user-readable explanation of what // went wrong. -IPC_MESSAGE_CONTROL1(UtilityHostMsg_UnpackWebResource_Failed, +IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_UnpackWebResource_Failed, std::string /* error_message, if any */) // Reply when the utility process has succeeded in parsing an update manifest // xml document. -IPC_MESSAGE_CONTROL1(UtilityHostMsg_ParseUpdateManifest_Succeeded, +IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_ParseUpdateManifest_Succeeded, UpdateManifest::Results /* updates */) // Reply when an error occured parsing the update manifest. |error_message| // is a description of what went wrong suitable for logging. -IPC_MESSAGE_CONTROL1(UtilityHostMsg_ParseUpdateManifest_Failed, +IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_ParseUpdateManifest_Failed, std::string /* error_message, if any */) // Reply when the utility process has succeeded in decoding the image. -IPC_MESSAGE_CONTROL1(UtilityHostMsg_DecodeImage_Succeeded, +IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_DecodeImage_Succeeded, SkBitmap) // decoded image // Reply when an error occured decoding the image. -IPC_MESSAGE_CONTROL0(UtilityHostMsg_DecodeImage_Failed) +IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_DecodeImage_Failed) // Reply when the utility process has succeeded in rendering the PDF. -IPC_MESSAGE_CONTROL1(UtilityHostMsg_RenderPDFPagesToMetafile_Succeeded, +IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_RenderPDFPagesToMetafile_Succeeded, int) // Highest rendered page number // Reply when an error occured rendering the PDF. -IPC_MESSAGE_CONTROL0(UtilityHostMsg_RenderPDFPagesToMetafile_Failed) +IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_RenderPDFPagesToMetafile_Failed) #if defined(OS_WIN) // Request that the given font be loaded by the host so it's cached by the // OS. Please see ChildProcessHost::PreCacheFont for details. -IPC_SYNC_MESSAGE_CONTROL1_0(UtilityHostMsg_PreCacheFont, +IPC_SYNC_MESSAGE_CONTROL1_0(ChromeUtilityHostMsg_PreCacheFont, LOGFONT /* font data */) #endif // defined(OS_WIN) @@ -156,20 +156,20 @@ IPC_SYNC_MESSAGE_CONTROL1_0(UtilityHostMsg_PreCacheFont, // pass indeterminate value types by const object reference with our IPC macros, // so we put the result Value into a ListValue. Handlers should examine the // first (and only) element of the ListValue for the actual result. -IPC_MESSAGE_CONTROL1(UtilityHostMsg_ParseJSON_Succeeded, +IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_ParseJSON_Succeeded, ListValue) // Reply when the utility process failed in parsing a JSON string. -IPC_MESSAGE_CONTROL1(UtilityHostMsg_ParseJSON_Failed, +IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_ParseJSON_Failed, std::string /* error message, if any*/) // Reply when the utility process has succeeded in obtaining the printer // capabilities and defaults. -IPC_MESSAGE_CONTROL2(UtilityHostMsg_GetPrinterCapsAndDefaults_Succeeded, +IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Succeeded, std::string /* printer name */, printing::PrinterCapsAndDefaults) // Reply when the utility process has failed to obtain the printer // capabilities and defaults. -IPC_MESSAGE_CONTROL1(UtilityHostMsg_GetPrinterCapsAndDefaults_Failed, +IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed, std::string /* printer name */) diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 976a8e9..63a8e7e 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -131,119 +131,120 @@ IPC_STRUCT_TRAITS_END() // These are messages sent from the browser to the renderer process. // Tells the renderer to set its maximum cache size to the supplied value. -IPC_MESSAGE_CONTROL3(ViewMsg_SetCacheCapacities, +IPC_MESSAGE_CONTROL3(ChromeViewMsg_SetCacheCapacities, size_t /* min_dead_capacity */, size_t /* max_dead_capacity */, size_t /* capacity */) // Tells the renderer to clear the cache. -IPC_MESSAGE_CONTROL0(ViewMsg_ClearCache) +IPC_MESSAGE_CONTROL0(ChromeViewMsg_ClearCache) // Tells the renderer to dump as much memory as it can, perhaps because we // have memory pressure or the renderer is (or will be) paged out. This // should only result in purging objects we can recalculate, e.g. caches or // JS garbage, not in purging irreplaceable objects. -IPC_MESSAGE_CONTROL0(ViewMsg_PurgeMemory) +IPC_MESSAGE_CONTROL0(ChromeViewMsg_PurgeMemory) // For WebUI testing, this message stores parameters to do ScriptEvalRequest at // a time which is late enough to not be thrown out, and early enough to be // before onload events are fired. -IPC_MESSAGE_ROUTED4(ViewMsg_WebUIJavaScript, +IPC_MESSAGE_ROUTED4(ChromeViewMsg_WebUIJavaScript, string16, /* frame_xpath */ string16, /* jscript_url */ int, /* ID */ bool /* If true, result is sent back. */) // Tells the render view to capture a thumbnail image of the page. The -// render view responds with a ViewHostMsg_Snapshot. -IPC_MESSAGE_ROUTED0(ViewMsg_CaptureSnapshot) +// render view responds with a ChromeViewHostMsg_Snapshot. +IPC_MESSAGE_ROUTED0(ChromeViewMsg_CaptureSnapshot) // History system notification that the visited link database has been // replaced. It has one SharedMemoryHandle argument consisting of the table // handle. This handle is valid in the context of the renderer -IPC_MESSAGE_CONTROL1(ViewMsg_VisitedLink_NewTable, base::SharedMemoryHandle) +IPC_MESSAGE_CONTROL1(ChromeViewMsg_VisitedLink_NewTable, + base::SharedMemoryHandle) // History system notification that a link has been added and the link // coloring state for the given hash must be re-calculated. -IPC_MESSAGE_CONTROL1(ViewMsg_VisitedLink_Add, std::vector<uint64>) +IPC_MESSAGE_CONTROL1(ChromeViewMsg_VisitedLink_Add, std::vector<uint64>) // History system notification that one or more history items have been // deleted, which at this point means that all link coloring state must be // re-calculated. -IPC_MESSAGE_CONTROL0(ViewMsg_VisitedLink_Reset) +IPC_MESSAGE_CONTROL0(ChromeViewMsg_VisitedLink_Reset) // Set the content settings for a particular url that the renderer is in the // process of loading. This will be stored, to be used if the load commits // and ignored otherwise. -IPC_MESSAGE_ROUTED2(ViewMsg_SetContentSettingsForLoadingURL, +IPC_MESSAGE_ROUTED2(ChromeViewMsg_SetContentSettingsForLoadingURL, GURL /* url */, ContentSettings /* content_settings */) // Set the content settings for a particular url, so all render views // displaying this host url update their content settings to match. -IPC_MESSAGE_CONTROL2(ViewMsg_SetContentSettingsForCurrentURL, +IPC_MESSAGE_CONTROL2(ChromeViewMsg_SetContentSettingsForCurrentURL, GURL /* url */, ContentSettings /* content_settings */) // Set the content settings for a particular url that the renderer is in the // process of loading. This will be stored, to be used if the load commits // and ignored otherwise. -IPC_MESSAGE_CONTROL1(ViewMsg_SetDefaultContentSettings, +IPC_MESSAGE_CONTROL1(ChromeViewMsg_SetDefaultContentSettings, ContentSettings /* content_settings */) // Tells the render view to load all blocked plugins. -IPC_MESSAGE_ROUTED0(ViewMsg_LoadBlockedPlugins) +IPC_MESSAGE_ROUTED0(ChromeViewMsg_LoadBlockedPlugins) // Asks the renderer to send back stats on the WebCore cache broken down by // resource types. -IPC_MESSAGE_CONTROL0(ViewMsg_GetCacheResourceStats) +IPC_MESSAGE_CONTROL0(ChromeViewMsg_GetCacheResourceStats) // Asks the renderer to send back Histograms. -IPC_MESSAGE_CONTROL1(ViewMsg_GetRendererHistograms, +IPC_MESSAGE_CONTROL1(ChromeViewMsg_GetRendererHistograms, int /* sequence number of Renderer Histograms. */) // Tells the renderer to create a FieldTrial, and by using a 100% probability // for the FieldTrial, forces the FieldTrial to have assigned group name. -IPC_MESSAGE_CONTROL2(ViewMsg_SetFieldTrialGroup, +IPC_MESSAGE_CONTROL2(ChromeViewMsg_SetFieldTrialGroup, std::string /* field trial name */, std::string /* group name that was assigned. */) #if defined(USE_TCMALLOC) // Asks the renderer to send back tcmalloc stats. -IPC_MESSAGE_CONTROL0(ViewMsg_GetRendererTcmalloc) +IPC_MESSAGE_CONTROL0(ChromeViewMsg_GetRendererTcmalloc) // Asks the renderer to enable/disable Tcmalloc heap profiling. // Note: filename_prefix arg is effectively ignored since the render process // will be unable to write files to disk. Instead use WriteTcmallocHeapProfile // to write a profile file. -IPC_MESSAGE_CONTROL2(ViewMsg_SetTcmallocHeapProfiling, +IPC_MESSAGE_CONTROL2(ChromeViewMsg_SetTcmallocHeapProfiling, bool /* enable profiling */, std::string /* filename prefix for profiles */) // Asks the renderer to write the Tcmalloc heap profile to a file. -IPC_MESSAGE_CONTROL1(ViewMsg_WriteTcmallocHeapProfile, +IPC_MESSAGE_CONTROL1(ChromeViewMsg_WriteTcmallocHeapProfile, FilePath::StringType /* filepath */) #endif // Asks the renderer to send back V8 heap stats. -IPC_MESSAGE_CONTROL0(ViewMsg_GetV8HeapStats) +IPC_MESSAGE_CONTROL0(ChromeViewMsg_GetV8HeapStats) // Posts a message to the renderer. -IPC_MESSAGE_ROUTED3(ViewMsg_HandleMessageFromExternalHost, +IPC_MESSAGE_ROUTED3(ChromeViewMsg_HandleMessageFromExternalHost, std::string /* The message */, std::string /* The origin */, std::string /* The target*/) -IPC_MESSAGE_ROUTED4(ViewMsg_SearchBoxChange, +IPC_MESSAGE_ROUTED4(ChromeViewMsg_SearchBoxChange, string16 /* value */, bool /* verbatim */, int /* selection_start */, int /* selection_end */) -IPC_MESSAGE_ROUTED2(ViewMsg_SearchBoxSubmit, +IPC_MESSAGE_ROUTED2(ChromeViewMsg_SearchBoxSubmit, string16 /* value */, bool /* verbatim */) -IPC_MESSAGE_ROUTED0(ViewMsg_SearchBoxCancel) -IPC_MESSAGE_ROUTED1(ViewMsg_SearchBoxResize, +IPC_MESSAGE_ROUTED0(ChromeViewMsg_SearchBoxCancel) +IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxResize, gfx::Rect /* search_box_bounds */) -IPC_MESSAGE_ROUTED4(ViewMsg_DetermineIfPageSupportsInstant, +IPC_MESSAGE_ROUTED4(ChromeViewMsg_DetermineIfPageSupportsInstant, string16 /* value*/, bool /* verbatim */, int /* selection_start */, @@ -251,7 +252,7 @@ IPC_MESSAGE_ROUTED4(ViewMsg_DetermineIfPageSupportsInstant, // Tells the renderer to translate the page contents from one language to // another. -IPC_MESSAGE_ROUTED4(ViewMsg_TranslatePage, +IPC_MESSAGE_ROUTED4(ChromeViewMsg_TranslatePage, int /* page id */, std::string, /* the script injected in the page */ std::string, /* BCP 47/RFC 5646 language code the page @@ -261,30 +262,30 @@ IPC_MESSAGE_ROUTED4(ViewMsg_TranslatePage, // Tells the renderer to revert the text of translated page to its original // contents. -IPC_MESSAGE_ROUTED1(ViewMsg_RevertTranslation, +IPC_MESSAGE_ROUTED1(ChromeViewMsg_RevertTranslation, int /* page id */) // Tells a renderer if it's currently being prerendered. Must only be set // to true before any navigation occurs, and only set to false at most once // after that. -IPC_MESSAGE_ROUTED1(ViewMsg_SetIsPrerendering, +IPC_MESSAGE_ROUTED1(ChromeViewMsg_SetIsPrerendering, bool /* whether the RenderView is prerendering */) // Sent on process startup to indicate whether this process is running in // incognito mode. -IPC_MESSAGE_CONTROL1(ViewMsg_SetIsIncognitoProcess, +IPC_MESSAGE_CONTROL1(ChromeViewMsg_SetIsIncognitoProcess, bool /* is_incognito_processs */) // Sent in response to ViewHostMsg_DidBlockDisplayingInsecureContent. -IPC_MESSAGE_ROUTED1(ViewMsg_SetAllowDisplayingInsecureContent, +IPC_MESSAGE_ROUTED1(ChromeViewMsg_SetAllowDisplayingInsecureContent, bool /* allowed */) // Sent in response to ViewHostMsg_DidBlockRunningInsecureContent. -IPC_MESSAGE_ROUTED1(ViewMsg_SetAllowRunningInsecureContent, +IPC_MESSAGE_ROUTED1(ChromeViewMsg_SetAllowRunningInsecureContent, bool /* allowed */) // Sent when the profile changes the kSafeBrowsingEnabled preference. -IPC_MESSAGE_ROUTED1(ViewMsg_SetClientSidePhishingDetection, +IPC_MESSAGE_ROUTED1(ChromeViewMsg_SetClientSidePhishingDetection, bool /* enable_phishing_detection */) //----------------------------------------------------------------------------- @@ -292,28 +293,28 @@ IPC_MESSAGE_ROUTED1(ViewMsg_SetClientSidePhishingDetection, // These are messages sent from the renderer to the browser process. // Provides the contents for the given page that was loaded recently. -IPC_MESSAGE_ROUTED3(ViewHostMsg_PageContents, +IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_PageContents, GURL /* URL of the page */, int32 /* page id */, string16 /* page contents */) // Notification that the language for the tab has been determined. -IPC_MESSAGE_ROUTED2(ViewHostMsg_TranslateLanguageDetermined, +IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_TranslateLanguageDetermined, std::string /* page ISO639_1 language code */, bool /* whether the page can be translated */) -IPC_MESSAGE_CONTROL1(ViewHostMsg_UpdatedCacheStats, +IPC_MESSAGE_CONTROL1(ChromeViewHostMsg_UpdatedCacheStats, WebKit::WebCache::UsageStats /* stats */) // Tells the browser that content in the current page was blocked due to the // user's content settings. -IPC_MESSAGE_ROUTED2(ViewHostMsg_ContentBlocked, +IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_ContentBlocked, ContentSettingsType, /* type of blocked content */ std::string /* resource identifier */) // Sent by the renderer process to check whether access to web databases is // granted by content settings. -IPC_SYNC_MESSAGE_CONTROL5_1(ViewHostMsg_AllowDatabase, +IPC_SYNC_MESSAGE_CONTROL5_1(ChromeViewHostMsg_AllowDatabase, int /* render_view_id */, GURL /* origin_url */, GURL /* top origin url */, @@ -323,7 +324,7 @@ IPC_SYNC_MESSAGE_CONTROL5_1(ViewHostMsg_AllowDatabase, // Sent by the renderer process to check whether access to DOM Storage is // granted by content settings. -IPC_SYNC_MESSAGE_CONTROL4_1(ViewHostMsg_AllowDOMStorage, +IPC_SYNC_MESSAGE_CONTROL4_1(ChromeViewHostMsg_AllowDOMStorage, int /* render_view_id */, GURL /* origin_url */, GURL /* top origin url */, @@ -332,7 +333,7 @@ IPC_SYNC_MESSAGE_CONTROL4_1(ViewHostMsg_AllowDOMStorage, // Sent by the renderer process to check whether access to FileSystem is // granted by content settings. -IPC_SYNC_MESSAGE_CONTROL3_1(ViewHostMsg_AllowFileSystem, +IPC_SYNC_MESSAGE_CONTROL3_1(ChromeViewHostMsg_AllowFileSystem, int /* render_view_id */, GURL /* origin_url */, GURL /* top origin url */, @@ -340,7 +341,7 @@ IPC_SYNC_MESSAGE_CONTROL3_1(ViewHostMsg_AllowFileSystem, // Sent by the renderer process to check whether access to Indexed DBis // granted by content settings. -IPC_SYNC_MESSAGE_CONTROL4_1(ViewHostMsg_AllowIndexedDB, +IPC_SYNC_MESSAGE_CONTROL4_1(ChromeViewHostMsg_AllowIndexedDB, int /* render_view_id */, GURL /* origin_url */, GURL /* top origin url */, @@ -361,20 +362,20 @@ IPC_SYNC_MESSAGE_CONTROL4_1(ViewHostMsg_AllowIndexedDB, // neither blocked nor white-listed, which means that it's allowed // by default and can still be blocked if it's non-sandboxed. // -IPC_SYNC_MESSAGE_CONTROL2_1(ViewHostMsg_GetPluginContentSetting, +IPC_SYNC_MESSAGE_CONTROL2_1(ChromeViewHostMsg_GetPluginContentSetting, GURL /* policy_url */, std::string /* resource */, ContentSetting /* setting */) // Specifies the URL as the first parameter (a wstring) and thumbnail as // binary data as the second parameter. -IPC_MESSAGE_ROUTED3(ViewHostMsg_Thumbnail, +IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_Thumbnail, GURL /* url */, ThumbnailScore /* score */, SkBitmap /* bitmap */) // Send a snapshot of the tab contents to the render host. -IPC_MESSAGE_ROUTED1(ViewHostMsg_Snapshot, +IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_Snapshot, SkBitmap /* bitmap */) // Following message is used to communicate the values received by the @@ -382,12 +383,12 @@ IPC_MESSAGE_ROUTED1(ViewHostMsg_Snapshot, // An instance of browser that has an automation host listening to it can // have a javascript send a native value (string, number, boolean) to the // listener in Cpp. (DomAutomationController) -IPC_MESSAGE_ROUTED2(ViewHostMsg_DomOperationResponse, +IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_DomOperationResponse, std::string /* json_string */, int /* automation_id */) // A message for an external host. -IPC_MESSAGE_ROUTED3(ViewHostMsg_ForwardMessageToExternalHost, +IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_ForwardMessageToExternalHost, std::string /* message */, std::string /* origin */, std::string /* target */) @@ -395,7 +396,7 @@ IPC_MESSAGE_ROUTED3(ViewHostMsg_ForwardMessageToExternalHost, // A renderer sends this to the browser process when it wants to start // a new instance of the Native Client process. The browser will launch // the process and return a handle to an IMC channel. -IPC_SYNC_MESSAGE_CONTROL2_3(ViewHostMsg_LaunchNaCl, +IPC_SYNC_MESSAGE_CONTROL2_3(ChromeViewHostMsg_LaunchNaCl, std::wstring /* url for the NaCl module */, int /* socket count */, std::vector<nacl::FileDescriptor> @@ -405,41 +406,41 @@ IPC_SYNC_MESSAGE_CONTROL2_3(ViewHostMsg_LaunchNaCl, // Notification that the page has an OpenSearch description document // associated with it. -IPC_MESSAGE_ROUTED3(ViewHostMsg_PageHasOSDD, +IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_PageHasOSDD, int32 /* page_id */, GURL /* url of OS description document */, search_provider::OSDDType) // Find out if the given url's security origin is installed as a search // provider. -IPC_SYNC_MESSAGE_ROUTED2_1(ViewHostMsg_GetSearchProviderInstallState, +IPC_SYNC_MESSAGE_ROUTED2_1(ChromeViewHostMsg_GetSearchProviderInstallState, GURL /* page url */, GURL /* inquiry url */, search_provider::InstallState /* install */) // Send back histograms as vector of pickled-histogram strings. -IPC_MESSAGE_CONTROL2(ViewHostMsg_RendererHistograms, +IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_RendererHistograms, int, /* sequence number of Renderer Histograms. */ std::vector<std::string>) #if defined USE_TCMALLOC // Send back tcmalloc stats output. -IPC_MESSAGE_CONTROL1(ViewHostMsg_RendererTcmalloc, +IPC_MESSAGE_CONTROL1(ChromeViewHostMsg_RendererTcmalloc, std::string /* tcmalloc debug output */) // Send back tcmalloc profile to write to a file. -IPC_MESSAGE_CONTROL2(ViewHostMsg_WriteTcmallocHeapProfile_ACK, +IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_WriteTcmallocHeapProfile_ACK, FilePath::StringType /* filepath */, std::string /* heap profile */) #endif // Sends back stats about the V8 heap. -IPC_MESSAGE_CONTROL2(ViewHostMsg_V8HeapStats, +IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_V8HeapStats, int /* size of heap (allocated from the OS) */, int /* bytes in use */) // Request for a DNS prefetch of the names in the array. // NameList is typedef'ed std::vector<std::string> -IPC_MESSAGE_CONTROL1(ViewHostMsg_DnsPrefetch, +IPC_MESSAGE_CONTROL1(ChromeViewHostMsg_DnsPrefetch, std::vector<std::string> /* hostnames */) // Requests the plugin policies. @@ -454,28 +455,28 @@ IPC_MESSAGE_CONTROL1(ViewHostMsg_DnsPrefetch, // BLOCK means that the plugin should not run nor be allowed to run at all. // ASK means that the plugin should be initially blocked and the user should // be asked whether he wants to run the plugin. -IPC_SYNC_MESSAGE_CONTROL0_2(ViewHostMsg_GetPluginPolicies, +IPC_SYNC_MESSAGE_CONTROL0_2(ChromeViewHostMsg_GetPluginPolicies, ContentSetting /* outdated_policy */, ContentSetting /* authorize_policy */) // Notifies when a plugin couldn't be loaded because it's outdated. -IPC_MESSAGE_ROUTED2(ViewHostMsg_BlockedOutdatedPlugin, +IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_BlockedOutdatedPlugin, string16, /* name */ GURL /* update_url */) // Provide the browser process with information about the WebCore resource // cache and current renderer framerate. -IPC_MESSAGE_CONTROL1(ViewHostMsg_ResourceTypeStats, +IPC_MESSAGE_CONTROL1(ChromeViewHostMsg_ResourceTypeStats, WebKit::WebCache::ResourceTypeStats) // Notifies the browser of the language (ISO 639_1 code language, such as fr, // en, zh...) of the current page. -IPC_MESSAGE_ROUTED1(ViewHostMsg_PageLanguageDetermined, +IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_PageLanguageDetermined, std::string /* the language */) // Notifies the browser that a page has been translated. -IPC_MESSAGE_ROUTED4(ViewHostMsg_PageTranslated, +IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_PageTranslated, int, /* page id */ std::string /* the original language */, std::string /* the translated language */, @@ -484,38 +485,38 @@ IPC_MESSAGE_ROUTED4(ViewHostMsg_PageTranslated, // Message sent from the renderer to the browser to notify it of events which // may lead to the cancellation of a prerender. The message is sent only when // the renderer is prerendering. -IPC_MESSAGE_ROUTED0(ViewHostMsg_MaybeCancelPrerenderForHTML5Media) +IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_MaybeCancelPrerenderForHTML5Media) // Message sent from the renderer to the browser to notify it of a // window.print() call which should cancel the prerender. The message is sent // only when the renderer is prerendering. -IPC_MESSAGE_ROUTED0(ViewHostMsg_CancelPrerenderForPrinting) +IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_CancelPrerenderForPrinting) // Sent by the renderer to check if a URL has permission to trigger a clipboard // read/write operation from the DOM. -IPC_SYNC_MESSAGE_ROUTED1_1(ViewHostMsg_CanTriggerClipboardRead, +IPC_SYNC_MESSAGE_ROUTED1_1(ChromeViewHostMsg_CanTriggerClipboardRead, GURL /* url */, bool /* allowed */) -IPC_SYNC_MESSAGE_ROUTED1_1(ViewHostMsg_CanTriggerClipboardWrite, +IPC_SYNC_MESSAGE_ROUTED1_1(ChromeViewHostMsg_CanTriggerClipboardWrite, GURL /* url */, bool /* allowed */) // Sent when the renderer was prevented from displaying insecure content in // a secure page by a security policy. The page may appear incomplete. -IPC_MESSAGE_ROUTED0(ViewHostMsg_DidBlockDisplayingInsecureContent) +IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_DidBlockDisplayingInsecureContent) // Sent when the renderer was prevented from running insecure content in // a secure origin by a security policy. The page may appear incomplete. -IPC_MESSAGE_ROUTED0(ViewHostMsg_DidBlockRunningInsecureContent) +IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_DidBlockRunningInsecureContent) // Suggest results ----------------------------------------------------------- -IPC_MESSAGE_ROUTED3(ViewHostMsg_SetSuggestions, +IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_SetSuggestions, int32 /* page_id */, std::vector<std::string> /* suggestions */, InstantCompleteBehavior) -IPC_MESSAGE_ROUTED2(ViewHostMsg_InstantSupportDetermined, +IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_InstantSupportDetermined, int32 /* page_id */, bool /* result */) @@ -523,6 +524,6 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_InstantSupportDetermined, // Notify the JavaScript engine in the render to change its parameters // while performing stress testing. -IPC_MESSAGE_ROUTED2(ViewMsg_JavaScriptStressTestControl, +IPC_MESSAGE_ROUTED2(ChromeViewMsg_JavaScriptStressTestControl, int /* cmd */, int /* param */) diff --git a/chrome/renderer/automation/dom_automation_controller.cc b/chrome/renderer/automation/dom_automation_controller.cc index 35e7c9a..2daac0b 100644 --- a/chrome/renderer/automation/dom_automation_controller.cc +++ b/chrome/renderer/automation/dom_automation_controller.cc @@ -78,7 +78,9 @@ void DomAutomationController::Send(const CppArgumentList& args, } bool succeeded = sender_->Send( - new ViewHostMsg_DomOperationResponse(routing_id_, json, automation_id_)); + new ChromeViewHostMsg_DomOperationResponse(routing_id_, + json, + automation_id_)); result->Set(succeeded); automation_id_ = MSG_ROUTING_NONE; @@ -110,7 +112,9 @@ void DomAutomationController::SendJSON(const CppArgumentList& args, std::string json = args[0].ToString(); result->Set(sender_->Send( - new ViewHostMsg_DomOperationResponse(routing_id_, json, automation_id_))); + new ChromeViewHostMsg_DomOperationResponse(routing_id_, + json, + automation_id_))); automation_id_ = MSG_ROUTING_NONE; } diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/blocked_plugin.cc index c72ca7c..5501aad 100644 --- a/chrome/renderer/blocked_plugin.cc +++ b/chrome/renderer/blocked_plugin.cc @@ -153,8 +153,9 @@ bool BlockedPlugin::OnMessageReceived(const IPC::Message& message) { &message, this, this, &BlockedPlugin::OnMenuItemSelected); } else { IPC_BEGIN_MESSAGE_MAP(BlockedPlugin, message) - IPC_MESSAGE_HANDLER(ViewMsg_LoadBlockedPlugins, OnLoadBlockedPlugins) - IPC_MESSAGE_HANDLER(ViewMsg_SetIsPrerendering, OnSetIsPrerendering) + IPC_MESSAGE_HANDLER(ChromeViewMsg_LoadBlockedPlugins, + OnLoadBlockedPlugins) + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetIsPrerendering, OnSetIsPrerendering) IPC_END_MESSAGE_MAP() } diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index c18df0d..c197af9 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -331,7 +331,7 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl( std::string resource; if (cmd->HasSwitch(switches::kEnableResourceContentSettings)) resource = group->identifier(); - render_view->Send(new ViewHostMsg_GetPluginContentSetting( + render_view->Send(new ChromeViewHostMsg_GetPluginContentSetting( frame->top()->document().url(), resource, &plugin_setting)); DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT); @@ -351,7 +351,7 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl( if (group->IsVulnerable() || group->RequiresAuthorization()) { // These policies are dynamic and can changed at runtime, so they aren't // cached here. - render_view->Send(new ViewHostMsg_GetPluginPolicies( + render_view->Send(new ChromeViewHostMsg_GetPluginPolicies( &outdated_policy, &authorize_policy)); } @@ -359,7 +359,7 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl( if (outdated_policy == CONTENT_SETTING_ASK || outdated_policy == CONTENT_SETTING_BLOCK) { if (outdated_policy == CONTENT_SETTING_ASK) { - render_view->Send(new ViewHostMsg_BlockedOutdatedPlugin( + render_view->Send(new ChromeViewHostMsg_BlockedOutdatedPlugin( render_view->routing_id(), group->GetGroupName(), GURL(group->GetUpdateURL()))); } @@ -380,7 +380,7 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl( (plugin_setting == CONTENT_SETTING_ALLOW || plugin_setting == CONTENT_SETTING_ASK) && host_setting == CONTENT_SETTING_DEFAULT) { - render_view->Send(new ViewHostMsg_BlockedOutdatedPlugin( + render_view->Send(new ChromeViewHostMsg_BlockedOutdatedPlugin( render_view->routing_id(), group->GetGroupName(), GURL())); return CreatePluginPlaceholder( render_view, frame, params, *group, IDR_BLOCKED_PLUGIN_HTML, diff --git a/chrome/renderer/chrome_ppapi_interfaces.cc b/chrome/renderer/chrome_ppapi_interfaces.cc index b3e83d5..22fec52 100644 --- a/chrome/renderer/chrome_ppapi_interfaces.cc +++ b/chrome/renderer/chrome_ppapi_interfaces.cc @@ -29,7 +29,7 @@ bool LaunchSelLdr(const char* alleged_url, int socket_count, std::vector<nacl::FileDescriptor> sockets; base::ProcessHandle nacl_process; if (!RenderThread::current()->Send( - new ViewHostMsg_LaunchNaCl( + new ChromeViewHostMsg_LaunchNaCl( ASCIIToWide(alleged_url), socket_count, &sockets, diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index 507033c..87ecba4 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -104,7 +104,8 @@ class RendererResourceDelegate : public ResourceDispatcherDelegate { void InformHostOfCacheStats() { WebCache::UsageStats stats; WebCache::getUsageStats(&stats); - RenderThread::current()->Send(new ViewHostMsg_UpdatedCacheStats(stats)); + RenderThread::current()->Send(new ChromeViewHostMsg_UpdatedCacheStats( + stats)); } ScopedRunnableMethodFactory<RendererResourceDelegate> method_factory_; @@ -405,24 +406,27 @@ bool ChromeRenderProcessObserver::OnControlMessageReceived( const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(ChromeRenderProcessObserver, message) - IPC_MESSAGE_HANDLER(ViewMsg_SetIsIncognitoProcess, OnSetIsIncognitoProcess) - IPC_MESSAGE_HANDLER(ViewMsg_SetDefaultContentSettings, + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetIsIncognitoProcess, + OnSetIsIncognitoProcess) + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetDefaultContentSettings, OnSetDefaultContentSettings) - IPC_MESSAGE_HANDLER(ViewMsg_SetContentSettingsForCurrentURL, + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetContentSettingsForCurrentURL, OnSetContentSettingsForCurrentURL) - IPC_MESSAGE_HANDLER(ViewMsg_SetCacheCapacities, OnSetCacheCapacities) - IPC_MESSAGE_HANDLER(ViewMsg_ClearCache, OnClearCache) - IPC_MESSAGE_HANDLER(ViewMsg_SetFieldTrialGroup, OnSetFieldTrialGroup) + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetCacheCapacities, OnSetCacheCapacities) + IPC_MESSAGE_HANDLER(ChromeViewMsg_ClearCache, OnClearCache) + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetFieldTrialGroup, OnSetFieldTrialGroup) #if defined(USE_TCMALLOC) - IPC_MESSAGE_HANDLER(ViewMsg_GetRendererTcmalloc, OnGetRendererTcmalloc) - IPC_MESSAGE_HANDLER(ViewMsg_SetTcmallocHeapProfiling, + IPC_MESSAGE_HANDLER(ChromeViewMsg_GetRendererTcmalloc, + OnGetRendererTcmalloc) + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetTcmallocHeapProfiling, OnSetTcmallocHeapProfiling) - IPC_MESSAGE_HANDLER(ViewMsg_WriteTcmallocHeapProfile, + IPC_MESSAGE_HANDLER(ChromeViewMsg_WriteTcmallocHeapProfile, OnWriteTcmallocHeapProfile) #endif - IPC_MESSAGE_HANDLER(ViewMsg_GetV8HeapStats, OnGetV8HeapStats) - IPC_MESSAGE_HANDLER(ViewMsg_GetCacheResourceStats, OnGetCacheResourceStats) - IPC_MESSAGE_HANDLER(ViewMsg_PurgeMemory, OnPurgeMemory) + IPC_MESSAGE_HANDLER(ChromeViewMsg_GetV8HeapStats, OnGetV8HeapStats) + IPC_MESSAGE_HANDLER(ChromeViewMsg_GetCacheResourceStats, + OnGetCacheResourceStats) + IPC_MESSAGE_HANDLER(ChromeViewMsg_PurgeMemory, OnPurgeMemory) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; @@ -463,7 +467,7 @@ void ChromeRenderProcessObserver::OnClearCache() { void ChromeRenderProcessObserver::OnGetCacheResourceStats() { WebCache::ResourceTypeStats stats; WebCache::getResourceTypeStats(&stats); - Send(new ViewHostMsg_ResourceTypeStats(stats)); + Send(new ChromeViewHostMsg_ResourceTypeStats(stats)); } #if defined(USE_TCMALLOC) @@ -472,7 +476,7 @@ void ChromeRenderProcessObserver::OnGetRendererTcmalloc() { char buffer[1024 * 32]; MallocExtension::instance()->GetStats(buffer, sizeof(buffer)); result.append(buffer); - Send(new ViewHostMsg_RendererTcmalloc(result)); + Send(new ChromeViewHostMsg_RendererTcmalloc(result)); } void ChromeRenderProcessObserver::OnSetTcmallocHeapProfiling( @@ -501,7 +505,7 @@ void ChromeRenderProcessObserver::OnWriteTcmallocHeapProfile( // a string and pass it to the handler (which runs on the browser host). std::string result(profile); delete profile; - Send(new ViewHostMsg_WriteTcmallocHeapProfile_ACK(filename, result)); + Send(new ChromeViewHostMsg_WriteTcmallocHeapProfile_ACK(filename, result)); #endif } @@ -516,8 +520,8 @@ void ChromeRenderProcessObserver::OnSetFieldTrialGroup( void ChromeRenderProcessObserver::OnGetV8HeapStats() { v8::HeapStatistics heap_stats; v8::V8::GetHeapStatistics(&heap_stats); - Send(new ViewHostMsg_V8HeapStats(heap_stats.total_heap_size(), - heap_stats.used_heap_size())); + Send(new ChromeViewHostMsg_V8HeapStats(heap_stats.total_heap_size(), + heap_stats.used_heap_size())); } void ChromeRenderProcessObserver::OnPurgeMemory() { diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc index 711d418..537a411 100644 --- a/chrome/renderer/chrome_render_view_observer.cc +++ b/chrome/renderer/chrome_render_view_observer.cc @@ -218,19 +218,19 @@ ChromeRenderViewObserver::~ChromeRenderViewObserver() { bool ChromeRenderViewObserver::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(ChromeRenderViewObserver, message) - IPC_MESSAGE_HANDLER(ViewMsg_WebUIJavaScript, OnWebUIJavaScript) - IPC_MESSAGE_HANDLER(ViewMsg_CaptureSnapshot, OnCaptureSnapshot) - IPC_MESSAGE_HANDLER(ViewMsg_HandleMessageFromExternalHost, + IPC_MESSAGE_HANDLER(ChromeViewMsg_WebUIJavaScript, OnWebUIJavaScript) + IPC_MESSAGE_HANDLER(ChromeViewMsg_CaptureSnapshot, OnCaptureSnapshot) + IPC_MESSAGE_HANDLER(ChromeViewMsg_HandleMessageFromExternalHost, OnHandleMessageFromExternalHost) - IPC_MESSAGE_HANDLER(ViewMsg_JavaScriptStressTestControl, + IPC_MESSAGE_HANDLER(ChromeViewMsg_JavaScriptStressTestControl, OnJavaScriptStressTestControl) IPC_MESSAGE_HANDLER(IconMsg_DownloadFavicon, OnDownloadFavicon) IPC_MESSAGE_HANDLER(ViewMsg_EnableViewSourceMode, OnEnableViewSourceMode) - IPC_MESSAGE_HANDLER(ViewMsg_SetAllowDisplayingInsecureContent, + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetAllowDisplayingInsecureContent, OnSetAllowDisplayingInsecureContent) - IPC_MESSAGE_HANDLER(ViewMsg_SetAllowRunningInsecureContent, + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetAllowRunningInsecureContent, OnSetAllowRunningInsecureContent) - IPC_MESSAGE_HANDLER(ViewMsg_SetClientSidePhishingDetection, + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetClientSidePhishingDetection, OnSetClientSidePhishingDetection) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -238,7 +238,7 @@ bool ChromeRenderViewObserver::OnMessageReceived(const IPC::Message& message) { // Filter only. IPC_BEGIN_MESSAGE_MAP(ChromeRenderViewObserver, message) IPC_MESSAGE_HANDLER(ViewMsg_Navigate, OnNavigate) - IPC_MESSAGE_HANDLER(ViewMsg_SetIsPrerendering, OnSetIsPrerendering); + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetIsPrerendering, OnSetIsPrerendering); IPC_END_MESSAGE_MAP() return handled; @@ -271,7 +271,7 @@ void ChromeRenderViewObserver::OnCaptureSnapshot() { "Snapshot should be empty on error, non-empty otherwise."; // Send the snapshot to the browser process. - Send(new ViewHostMsg_Snapshot(routing_id(), snapshot)); + Send(new ChromeViewHostMsg_Snapshot(routing_id(), snapshot)); } void ChromeRenderViewObserver::OnHandleMessageFromExternalHost( @@ -391,7 +391,7 @@ bool ChromeRenderViewObserver::allowStorage(WebFrame* frame, bool local) { bool ChromeRenderViewObserver::allowReadFromClipboard(WebFrame* frame, bool default_value) { bool allowed = false; - Send(new ViewHostMsg_CanTriggerClipboardRead( + Send(new ChromeViewHostMsg_CanTriggerClipboardRead( routing_id(), frame->document().url(), &allowed)); return allowed; } @@ -399,7 +399,7 @@ bool ChromeRenderViewObserver::allowReadFromClipboard(WebFrame* frame, bool ChromeRenderViewObserver::allowWriteToClipboard(WebFrame* frame, bool default_value) { bool allowed = false; - Send(new ViewHostMsg_CanTriggerClipboardWrite( + Send(new ChromeViewHostMsg_CanTriggerClipboardWrite( routing_id(), frame->document().url(), &allowed)); return allowed; } @@ -486,7 +486,7 @@ bool ChromeRenderViewObserver::allowDisplayingInsecureContent( if (allowed_per_settings || allow_displaying_insecure_content_) return true; - Send(new ViewHostMsg_DidBlockDisplayingInsecureContent(routing_id())); + Send(new ChromeViewHostMsg_DidBlockDisplayingInsecureContent(routing_id())); return false; } @@ -589,7 +589,7 @@ bool ChromeRenderViewObserver::allowRunningInsecureContent( if (allowed_per_settings || allow_running_insecure_content_) return true; - Send(new ViewHostMsg_DidBlockRunningInsecureContent(routing_id())); + Send(new ChromeViewHostMsg_DidBlockRunningInsecureContent(routing_id())); return false; } @@ -636,7 +636,7 @@ void ChromeRenderViewObserver::DidStopLoading() { WebFrame* main_frame = render_view()->webview()->mainFrame(); GURL osd_url = main_frame->document().openSearchDescriptionURL(); if (!osd_url.is_empty()) { - Send(new ViewHostMsg_PageHasOSDD( + Send(new ChromeViewHostMsg_PageHasOSDD( routing_id(), render_view()->page_id(), osd_url, search_provider::AUTODETECTED_PROVIDER)); } @@ -746,7 +746,8 @@ void ChromeRenderViewObserver::CapturePageInfo(int load_id, if (contents.size()) { // Send the text to the browser for indexing (the browser might decide not // to index, if the URL is HTTPS for instance) and language discovery. - Send(new ViewHostMsg_PageContents(routing_id(), url, load_id, contents)); + Send(new ChromeViewHostMsg_PageContents(routing_id(), url, load_id, + contents)); } // Generate the thumbnail here if the in-browser thumbnailing isn't @@ -815,7 +816,7 @@ void ChromeRenderViewObserver::CaptureThumbnail() { return; // send the thumbnail message to the browser process - Send(new ViewHostMsg_Thumbnail(routing_id(), url, score, thumbnail)); + Send(new ChromeViewHostMsg_Thumbnail(routing_id(), url, score, thumbnail)); } bool ChromeRenderViewObserver::CaptureFrameThumbnail(WebView* view, diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index 59f58df..c89482e 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -91,7 +91,7 @@ void ContentSettingsObserver::DidBlockContentType( // time). if (!content_blocked_[settings_type] || !resource_identifier.empty()) { content_blocked_[settings_type] = true; - Send(new ViewHostMsg_ContentBlocked(routing_id(), settings_type, + Send(new ChromeViewHostMsg_ContentBlocked(routing_id(), settings_type, resource_identifier)); } } @@ -101,9 +101,9 @@ bool ContentSettingsObserver::OnMessageReceived(const IPC::Message& message) { IPC_BEGIN_MESSAGE_MAP(ContentSettingsObserver, message) // Don't swallow LoadBlockedPlugins messages, as they're sent to every // blocked plugin. - IPC_MESSAGE_HANDLER_GENERIC(ViewMsg_LoadBlockedPlugins, + IPC_MESSAGE_HANDLER_GENERIC(ChromeViewMsg_LoadBlockedPlugins, OnLoadBlockedPlugins(); handled = false) - IPC_MESSAGE_HANDLER(ViewMsg_SetContentSettingsForLoadingURL, + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetContentSettingsForLoadingURL, OnSetContentSettingsForLoadingURL) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -175,7 +175,7 @@ bool ContentSettingsObserver::AllowDatabase(WebFrame* frame, return false; // Uninitialized document. bool result = false; - Send(new ViewHostMsg_AllowDatabase( + Send(new ChromeViewHostMsg_AllowDatabase( routing_id(), GURL(frame->document().securityOrigin().toString()), GURL(frame->top()->document().securityOrigin().toString()), name, display_name, &result)); @@ -188,7 +188,7 @@ bool ContentSettingsObserver::AllowFileSystem(WebFrame* frame) { return false; // Uninitialized document. bool result = false; - Send(new ViewHostMsg_AllowFileSystem( + Send(new ChromeViewHostMsg_AllowFileSystem( routing_id(), GURL(frame->document().securityOrigin().toString()), GURL(frame->top()->document().securityOrigin().toString()), &result)); return result; @@ -216,7 +216,7 @@ bool ContentSettingsObserver::AllowIndexedDB(WebFrame* frame, return false; // Uninitialized document. bool result = false; - Send(new ViewHostMsg_AllowIndexedDB( + Send(new ChromeViewHostMsg_AllowIndexedDB( routing_id(), GURL(frame->document().securityOrigin().toString()), GURL(frame->top()->document().securityOrigin().toString()), name, &result)); @@ -254,7 +254,7 @@ bool ContentSettingsObserver::AllowStorage(WebFrame* frame, bool local) { if (permissions != cached_storage_permissions_.end()) return permissions->second; - Send(new ViewHostMsg_AllowDOMStorage( + Send(new ChromeViewHostMsg_AllowDOMStorage( routing_id(), GURL(frame->document().securityOrigin().toString()), GURL(frame->top()->document().securityOrigin().toString()), local ? DOM_STORAGE_LOCAL : DOM_STORAGE_SESSION, diff --git a/chrome/renderer/content_settings_observer_browsertest.cc b/chrome/renderer/content_settings_observer_browsertest.cc index 8fbea14..64977ae 100644 --- a/chrome/renderer/content_settings_observer_browsertest.cc +++ b/chrome/renderer/content_settings_observer_browsertest.cc @@ -37,8 +37,8 @@ MockContentSettingsObserver::MockContentSettingsObserver( bool MockContentSettingsObserver::Send(IPC::Message* message) { IPC_BEGIN_MESSAGE_MAP(MockContentSettingsObserver, *message) - IPC_MESSAGE_HANDLER(ViewHostMsg_ContentBlocked, OnContentBlocked) - IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_AllowDOMStorage, + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ContentBlocked, OnContentBlocked) + IPC_MESSAGE_HANDLER_DELAY_REPLY(ChromeViewHostMsg_AllowDOMStorage, OnAllowDOMStorage) IPC_MESSAGE_UNHANDLED(ADD_FAILURE()) IPC_END_MESSAGE_MAP() @@ -131,7 +131,7 @@ TEST_F(RenderViewTest, JSBlockSentAfterPageLoad) { const IPC::Message* msg = render_thread_.sink().GetMessageAt(i); if (msg->type() == ViewHostMsg_FrameNavigate::ID) navigation_index = i; - if (msg->type() == ViewHostMsg_ContentBlocked::ID) + if (msg->type() == ChromeViewHostMsg_ContentBlocked::ID) block_index = i; } EXPECT_NE(-1, navigation_index); @@ -155,7 +155,7 @@ TEST_F(RenderViewTest, PluginsTemporarilyAllowed) { observer->GetContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS)); // Temporarily allow plugins. - view_->OnMessageReceived(ViewMsg_LoadBlockedPlugins(MSG_ROUTING_NONE)); + view_->OnMessageReceived(ChromeViewMsg_LoadBlockedPlugins(MSG_ROUTING_NONE)); EXPECT_EQ(CONTENT_SETTING_ALLOW, observer->GetContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS)); diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc index a3bc2d7..010e910 100644 --- a/chrome/renderer/external_extension.cc +++ b/chrome/renderer/external_extension.cc @@ -131,7 +131,7 @@ v8::Handle<v8::Value> ExternalExtensionWrapper::AddSearchProvider( render_view->webview()->mainFrame()->isProcessingUserGesture()) { GURL osd_url(name); if (!osd_url.is_empty()) { - render_view->Send(new ViewHostMsg_PageHasOSDD( + render_view->Send(new ChromeViewHostMsg_PageHasOSDD( render_view->routing_id(), render_view->page_id(), osd_url, provider_type)); } @@ -157,7 +157,7 @@ v8::Handle<v8::Value> ExternalExtensionWrapper::IsSearchProviderInstalled( search_provider::InstallState install = search_provider::DENIED; GURL inquiry_url = GURL(name); if (!inquiry_url.is_empty()) { - render_view->Send(new ViewHostMsg_GetSearchProviderInstallState( + render_view->Send(new ChromeViewHostMsg_GetSearchProviderInstallState( render_view->routing_id(), webframe->document().url(), inquiry_url, diff --git a/chrome/renderer/external_host_bindings.cc b/chrome/renderer/external_host_bindings.cc index 4b95ddd..cabd4c2 100644 --- a/chrome/renderer/external_host_bindings.cc +++ b/chrome/renderer/external_host_bindings.cc @@ -50,8 +50,9 @@ void ExternalHostBindings::postMessage( std::string origin = frame_->document().securityOrigin().toString().utf8(); - result->Set(sender()->Send(new ViewHostMsg_ForwardMessageToExternalHost( - routing_id(), message, origin, target))); + result->Set(sender()->Send( + new ChromeViewHostMsg_ForwardMessageToExternalHost( + routing_id(), message, origin, target))); } bool ExternalHostBindings::ForwardMessageFromExternalHost( diff --git a/chrome/renderer/net/renderer_net_predictor.cc b/chrome/renderer/net/renderer_net_predictor.cc index 65fcbe2..16cc665 100644 --- a/chrome/renderer/net/renderer_net_predictor.cc +++ b/chrome/renderer/net/renderer_net_predictor.cc @@ -142,7 +142,7 @@ void RendererNetPredictor::DnsPrefetchNames(size_t max_count) { DCHECK_GE(new_name_count_, names.size()); new_name_count_ -= names.size(); - RenderThread::current()->Send(new ViewHostMsg_DnsPrefetch(names)); + RenderThread::current()->Send(new ChromeViewHostMsg_DnsPrefetch(names)); } // is_numeric_ip() checks to see if all characters in name are either numeric, diff --git a/chrome/renderer/prerender/prerender_helper.cc b/chrome/renderer/prerender/prerender_helper.cc index 67092dc..4a15668 100644 --- a/chrome/renderer/prerender/prerender_helper.cc +++ b/chrome/renderer/prerender/prerender_helper.cc @@ -114,7 +114,7 @@ void PrerenderHelper::WillCreateMediaPlayer( if (is_prerendering_) { // Cancel prerendering in the case of HTML5 media, to avoid playing sounds // in the background. - Send(new ViewHostMsg_MaybeCancelPrerenderForHTML5Media( + Send(new ChromeViewHostMsg_MaybeCancelPrerenderForHTML5Media( render_view()->routing_id())); } } @@ -140,7 +140,7 @@ void PrerenderHelper::DidStartProvisionalLoad(WebKit::WebFrame* frame) { bool PrerenderHelper::OnMessageReceived( const IPC::Message& message) { IPC_BEGIN_MESSAGE_MAP(PrerenderHelper, message) - IPC_MESSAGE_HANDLER(ViewMsg_SetIsPrerendering, OnSetIsPrerendering) + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetIsPrerendering, OnSetIsPrerendering) IPC_END_MESSAGE_MAP() // Return false on ViewMsg_SetIsPrerendering so other observers can see the // message. diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index a0f58fd..485667f9 100644 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -432,7 +432,7 @@ void PrintWebViewHelper::PrintPage(WebKit::WebFrame* frame) { // Allow Prerendering to cancel this print request if necessary. if (prerender::PrerenderHelper::IsPrerendering(render_view())) { - Send(new ViewHostMsg_CancelPrerenderForPrinting(routing_id())); + Send(new ChromeViewHostMsg_CancelPrerenderForPrinting(routing_id())); return; } diff --git a/chrome/renderer/renderer_histogram_snapshots.cc b/chrome/renderer/renderer_histogram_snapshots.cc index feb9d64..8cf4082 100644 --- a/chrome/renderer/renderer_histogram_snapshots.cc +++ b/chrome/renderer/renderer_histogram_snapshots.cc @@ -36,7 +36,8 @@ bool RendererHistogramSnapshots::OnControlMessageReceived( const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(RendererHistogramSnapshots, message) - IPC_MESSAGE_HANDLER(ViewMsg_GetRendererHistograms, OnGetRendererHistograms) + IPC_MESSAGE_HANDLER(ChromeViewMsg_GetRendererHistograms, + OnGetRendererHistograms) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; @@ -55,7 +56,7 @@ void RendererHistogramSnapshots::UploadAllHistrograms(int sequence_number) { // Send the sequence number and list of pickled histograms over synchronous // IPC, so we can clear pickled_histograms_ afterwards. RenderThread::current()->Send( - new ViewHostMsg_RendererHistograms( + new ChromeViewHostMsg_RendererHistograms( sequence_number, pickled_histograms_)); pickled_histograms_.clear(); diff --git a/chrome/renderer/searchbox.cc b/chrome/renderer/searchbox.cc index 0b16ec5..9041c1f 100644 --- a/chrome/renderer/searchbox.cc +++ b/chrome/renderer/searchbox.cc @@ -25,7 +25,7 @@ SearchBox::~SearchBox() { void SearchBox::SetSuggestions(const std::vector<std::string>& suggestions, InstantCompleteBehavior behavior) { // Explicitly allow empty vector to be sent to the browser. - render_view()->Send(new ViewHostMsg_SetSuggestions( + render_view()->Send(new ChromeViewHostMsg_SetSuggestions( render_view()->routing_id(), render_view()->page_id(), suggestions, behavior)); } @@ -33,11 +33,11 @@ void SearchBox::SetSuggestions(const std::vector<std::string>& suggestions, bool SearchBox::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(SearchBox, message) - IPC_MESSAGE_HANDLER(ViewMsg_SearchBoxChange, OnChange) - IPC_MESSAGE_HANDLER(ViewMsg_SearchBoxSubmit, OnSubmit) - IPC_MESSAGE_HANDLER(ViewMsg_SearchBoxCancel, OnCancel) - IPC_MESSAGE_HANDLER(ViewMsg_SearchBoxResize, OnResize) - IPC_MESSAGE_HANDLER(ViewMsg_DetermineIfPageSupportsInstant, + IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxChange, OnChange) + IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSubmit, OnSubmit) + IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxCancel, OnCancel) + IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxResize, OnResize) + IPC_MESSAGE_HANDLER(ChromeViewMsg_DetermineIfPageSupportsInstant, OnDetermineIfPageSupportsInstant) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -95,7 +95,7 @@ void SearchBox::OnDetermineIfPageSupportsInstant(const string16& value, selection_end_ = selection_end; bool result = extensions_v8::SearchBoxExtension::PageSupportsInstant( render_view()->webview()->mainFrame()); - render_view()->Send(new ViewHostMsg_InstantSupportDetermined( + render_view()->Send(new ChromeViewHostMsg_InstantSupportDetermined( render_view()->routing_id(), render_view()->page_id(), result)); } diff --git a/chrome/renderer/translate_helper.cc b/chrome/renderer/translate_helper.cc index e19c85a..6710a9d 100644 --- a/chrome/renderer/translate_helper.cc +++ b/chrome/renderer/translate_helper.cc @@ -70,7 +70,7 @@ void TranslateHelper::PageCaptured(const string16& contents) { base::TimeTicks::Now() - begin_time); } - Send(new ViewHostMsg_TranslateLanguageDetermined( + Send(new ChromeViewHostMsg_TranslateLanguageDetermined( routing_id(), language, IsPageTranslatable(&document))); } @@ -235,8 +235,8 @@ bool TranslateHelper::DontDelayTasks() { bool TranslateHelper::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(TranslateHelper, message) - IPC_MESSAGE_HANDLER(ViewMsg_TranslatePage, OnTranslatePage) - IPC_MESSAGE_HANDLER(ViewMsg_RevertTranslation, OnRevertTranslation) + IPC_MESSAGE_HANDLER(ChromeViewMsg_TranslatePage, OnTranslatePage) + IPC_MESSAGE_HANDLER(ChromeViewMsg_RevertTranslation, OnRevertTranslation) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; @@ -336,7 +336,7 @@ void TranslateHelper::CheckTranslateStatus() { autofill_->FrameTranslated(render_view()->webview()->mainFrame()); // Notify the browser we are done. - render_view()->Send(new ViewHostMsg_PageTranslated( + render_view()->Send(new ChromeViewHostMsg_PageTranslated( render_view()->routing_id(), render_view()->page_id(), actual_source_lang, target_lang_, TranslateErrors::NONE)); return; @@ -425,7 +425,7 @@ void TranslateHelper::NotifyBrowserTranslationFailed( TranslateErrors::Type error) { translation_pending_ = false; // Notify the browser there was an error. - render_view()->Send(new ViewHostMsg_PageTranslated( + render_view()->Send(new ChromeViewHostMsg_PageTranslated( render_view()->routing_id(), page_id_, source_lang_, target_lang_, error)); } diff --git a/chrome/renderer/translate_helper_browsertest.cc b/chrome/renderer/translate_helper_browsertest.cc index efc2dfb..e16e44d 100644 --- a/chrome/renderer/translate_helper_browsertest.cc +++ b/chrome/renderer/translate_helper_browsertest.cc @@ -53,12 +53,12 @@ class TranslateHelperTest : public RenderViewTest { std::string* target_lang, TranslateErrors::Type* error) { const IPC::Message* message = render_thread_.sink(). - GetUniqueMessageMatching(ViewHostMsg_PageTranslated::ID); + GetUniqueMessageMatching(ChromeViewHostMsg_PageTranslated::ID); if (!message) return false; Tuple4<int, std::string, std::string, TranslateErrors::Type> translate_param; - ViewHostMsg_PageTranslated::Read(message, &translate_param); + ChromeViewHostMsg_PageTranslated::Read(message, &translate_param); if (page_id) *page_id = translate_param.a; if (original_lang) @@ -304,10 +304,10 @@ TEST_F(RenderViewTest, TranslatablePage) { LoadHTML("<html><body>A random page with random content.</body></html>"); ProcessPendingMessages(); const IPC::Message* message = render_thread_.sink().GetUniqueMessageMatching( - ViewHostMsg_TranslateLanguageDetermined::ID); + ChromeViewHostMsg_TranslateLanguageDetermined::ID); ASSERT_NE(static_cast<IPC::Message*>(NULL), message); - ViewHostMsg_TranslateLanguageDetermined::Param params; - ViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms); + ChromeViewHostMsg_TranslateLanguageDetermined::Param params; + ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms); EXPECT_TRUE(params.b); // Translatable should be true. render_thread_.sink().ClearMessages(); @@ -316,9 +316,9 @@ TEST_F(RenderViewTest, TranslatablePage) { "<body>A random page with random content.</body></html>"); ProcessPendingMessages(); message = render_thread_.sink().GetUniqueMessageMatching( - ViewHostMsg_TranslateLanguageDetermined::ID); + ChromeViewHostMsg_TranslateLanguageDetermined::ID); ASSERT_NE(static_cast<IPC::Message*>(NULL), message); - ViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms); + ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms); EXPECT_FALSE(params.b); // Translatable should be false. render_thread_.sink().ClearMessages(); @@ -327,9 +327,9 @@ TEST_F(RenderViewTest, TranslatablePage) { "<body>A random page with random content.</body></html>"); ProcessPendingMessages(); message = render_thread_.sink().GetUniqueMessageMatching( - ViewHostMsg_TranslateLanguageDetermined::ID); + ChromeViewHostMsg_TranslateLanguageDetermined::ID); ASSERT_NE(static_cast<IPC::Message*>(NULL), message); - ViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms); + ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms); EXPECT_FALSE(params.b); // Translatable should be false. } @@ -344,10 +344,10 @@ TEST_F(RenderViewTest, LanguageMetaTag) { "</head><body>A random page with random content.</body></html>"); ProcessPendingMessages(); const IPC::Message* message = render_thread_.sink().GetUniqueMessageMatching( - ViewHostMsg_TranslateLanguageDetermined::ID); + ChromeViewHostMsg_TranslateLanguageDetermined::ID); ASSERT_NE(static_cast<IPC::Message*>(NULL), message); - ViewHostMsg_TranslateLanguageDetermined::Param params; - ViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms); + ChromeViewHostMsg_TranslateLanguageDetermined::Param params; + ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms); EXPECT_EQ("es", params.a); render_thread_.sink().ClearMessages(); @@ -357,8 +357,8 @@ TEST_F(RenderViewTest, LanguageMetaTag) { "</head><body>A random page with random content.</body></html>"); ProcessPendingMessages(); message = render_thread_.sink().GetUniqueMessageMatching( - ViewHostMsg_TranslateLanguageDetermined::ID); + ChromeViewHostMsg_TranslateLanguageDetermined::ID); ASSERT_NE(static_cast<IPC::Message*>(NULL), message); - ViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms); + ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms); EXPECT_EQ("fr", params.a); } diff --git a/chrome/renderer/visitedlink_slave.cc b/chrome/renderer/visitedlink_slave.cc index 9f301d9..35a2100 100644 --- a/chrome/renderer/visitedlink_slave.cc +++ b/chrome/renderer/visitedlink_slave.cc @@ -21,9 +21,10 @@ VisitedLinkSlave::~VisitedLinkSlave() { bool VisitedLinkSlave::OnControlMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(VisitedLinkSlave, message) - IPC_MESSAGE_HANDLER(ViewMsg_VisitedLink_NewTable, OnUpdateVisitedLinks) - IPC_MESSAGE_HANDLER(ViewMsg_VisitedLink_Add, OnAddVisitedLinks) - IPC_MESSAGE_HANDLER(ViewMsg_VisitedLink_Reset, OnResetVisitedLinks) + IPC_MESSAGE_HANDLER(ChromeViewMsg_VisitedLink_NewTable, + OnUpdateVisitedLinks) + IPC_MESSAGE_HANDLER(ChromeViewMsg_VisitedLink_Add, OnAddVisitedLinks) + IPC_MESSAGE_HANDLER(ChromeViewMsg_VisitedLink_Reset, OnResetVisitedLinks) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc index dda918a..c633773 100644 --- a/chrome/service/service_utility_process_host.cc +++ b/chrome/service/service_utility_process_host.cc @@ -74,11 +74,12 @@ bool ServiceUtilityProcessHost::StartRenderPDFPagesToMetafile( return false; waiting_for_reply_ = true; return Send( - new UtilityMsg_RenderPDFPagesToMetafile(pdf_file_in_utility_process, - metafile_path_, - render_area, - render_dpi, - page_ranges)); + new ChromeUtilityMsg_RenderPDFPagesToMetafile( + pdf_file_in_utility_process, + metafile_path_, + render_area, + render_dpi, + page_ranges)); #endif // !defined(OS_WIN) } @@ -88,7 +89,7 @@ bool ServiceUtilityProcessHost::StartGetPrinterCapsAndDefaults( if (!StartProcess(true, exposed_path)) return false; waiting_for_reply_ = true; - return Send(new UtilityMsg_GetPrinterCapsAndDefaults(printer_name)); + return Send(new ChromeUtilityMsg_GetPrinterCapsAndDefaults(printer_name)); } bool ServiceUtilityProcessHost::StartProcess(bool no_sandbox, @@ -138,10 +139,11 @@ bool ServiceUtilityProcessHost::OnMessageReceived(const IPC::Message& message) { bool msg_is_ok = false; IPC_BEGIN_MESSAGE_MAP_EX(ServiceUtilityProcessHost, message, msg_is_ok) #if defined(OS_WIN) // This hack is Windows-specific. - IPC_MESSAGE_HANDLER(UtilityHostMsg_PreCacheFont, OnPreCacheFont) + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_PreCacheFont, OnPreCacheFont) #endif - IPC_MESSAGE_HANDLER(UtilityHostMsg_RenderPDFPagesToMetafile_Succeeded, - OnRenderPDFPagesToMetafileSucceeded) + IPC_MESSAGE_HANDLER( + ChromeUtilityHostMsg_RenderPDFPagesToMetafile_Succeeded, + OnRenderPDFPagesToMetafileSucceeded) IPC_MESSAGE_UNHANDLED(msg_is_ok__ = MessageForClient(message)) IPC_END_MESSAGE_MAP_EX() return true; @@ -184,11 +186,12 @@ bool ServiceUtilityProcessHost::Client::OnMessageReceived( bool msg_is_ok = true; bool handled = true; IPC_BEGIN_MESSAGE_MAP_EX(ServiceUtilityProcessHost, message, msg_is_ok) - IPC_MESSAGE_HANDLER(UtilityHostMsg_RenderPDFPagesToMetafile_Failed, + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_RenderPDFPagesToMetafile_Failed, Client::OnRenderPDFPagesToMetafileFailed) - IPC_MESSAGE_HANDLER(UtilityHostMsg_GetPrinterCapsAndDefaults_Succeeded, - Client::OnGetPrinterCapsAndDefaultsSucceeded) - IPC_MESSAGE_HANDLER(UtilityHostMsg_GetPrinterCapsAndDefaults_Failed, + IPC_MESSAGE_HANDLER( + ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Succeeded, + Client::OnGetPrinterCapsAndDefaultsSucceeded) + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed, Client::OnGetPrinterCapsAndDefaultsFailed) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP_EX() diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc index 2b00945..2f1b895 100644 --- a/chrome/utility/chrome_content_utility_client.cc +++ b/chrome/utility/chrome_content_utility_client.cc @@ -62,15 +62,17 @@ bool ChromeContentUtilityClient::OnMessageReceived( const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(ChromeContentUtilityClient, message) - IPC_MESSAGE_HANDLER(UtilityMsg_UnpackExtension, OnUnpackExtension) - IPC_MESSAGE_HANDLER(UtilityMsg_UnpackWebResource, OnUnpackWebResource) - IPC_MESSAGE_HANDLER(UtilityMsg_ParseUpdateManifest, OnParseUpdateManifest) - IPC_MESSAGE_HANDLER(UtilityMsg_DecodeImage, OnDecodeImage) - IPC_MESSAGE_HANDLER(UtilityMsg_DecodeImageBase64, OnDecodeImageBase64) - IPC_MESSAGE_HANDLER(UtilityMsg_RenderPDFPagesToMetafile, + IPC_MESSAGE_HANDLER(ChromeUtilityMsg_UnpackExtension, OnUnpackExtension) + IPC_MESSAGE_HANDLER(ChromeUtilityMsg_UnpackWebResource, + OnUnpackWebResource) + IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseUpdateManifest, + OnParseUpdateManifest) + IPC_MESSAGE_HANDLER(ChromeUtilityMsg_DecodeImage, OnDecodeImage) + IPC_MESSAGE_HANDLER(ChromeUtilityMsg_DecodeImageBase64, OnDecodeImageBase64) + IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RenderPDFPagesToMetafile, OnRenderPDFPagesToMetafile) - IPC_MESSAGE_HANDLER(UtilityMsg_ParseJSON, OnParseJSON) - IPC_MESSAGE_HANDLER(UtilityMsg_GetPrinterCapsAndDefaults, + IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseJSON, OnParseJSON) + IPC_MESSAGE_HANDLER(ChromeUtilityMsg_GetPrinterCapsAndDefaults, OnGetPrinterCapsAndDefaults) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -86,10 +88,11 @@ void ChromeContentUtilityClient::OnUnpackExtension( ExtensionUnpacker unpacker(extension_path); if (unpacker.Run() && unpacker.DumpImagesToFile() && unpacker.DumpMessageCatalogsToFile()) { - Send(new UtilityHostMsg_UnpackExtension_Succeeded( + Send(new ChromeUtilityHostMsg_UnpackExtension_Succeeded( *unpacker.parsed_manifest())); } else { - Send(new UtilityHostMsg_UnpackExtension_Failed(unpacker.error_message())); + Send(new ChromeUtilityHostMsg_UnpackExtension_Failed( + unpacker.error_message())); } UtilityThread::current()->ReleaseProcessIfNeeded(); @@ -102,10 +105,10 @@ void ChromeContentUtilityClient::OnUnpackWebResource( // the ability to download and verify images. WebResourceUnpacker unpacker(resource_data); if (unpacker.Run()) { - Send(new UtilityHostMsg_UnpackWebResource_Succeeded( + Send(new ChromeUtilityHostMsg_UnpackWebResource_Succeeded( *unpacker.parsed_json())); } else { - Send(new UtilityHostMsg_UnpackWebResource_Failed( + Send(new ChromeUtilityHostMsg_UnpackWebResource_Failed( unpacker.error_message())); } @@ -115,9 +118,11 @@ void ChromeContentUtilityClient::OnUnpackWebResource( void ChromeContentUtilityClient::OnParseUpdateManifest(const std::string& xml) { UpdateManifest manifest; if (!manifest.Parse(xml)) { - Send(new UtilityHostMsg_ParseUpdateManifest_Failed(manifest.errors())); + Send(new ChromeUtilityHostMsg_ParseUpdateManifest_Failed( + manifest.errors())); } else { - Send(new UtilityHostMsg_ParseUpdateManifest_Succeeded(manifest.results())); + Send(new ChromeUtilityHostMsg_ParseUpdateManifest_Succeeded( + manifest.results())); } UtilityThread::current()->ReleaseProcessIfNeeded(); } @@ -128,9 +133,9 @@ void ChromeContentUtilityClient::OnDecodeImage( const SkBitmap& decoded_image = decoder.Decode(&encoded_data[0], encoded_data.size()); if (decoded_image.empty()) { - Send(new UtilityHostMsg_DecodeImage_Failed()); + Send(new ChromeUtilityHostMsg_DecodeImage_Failed()); } else { - Send(new UtilityHostMsg_DecodeImage_Succeeded(decoded_image)); + Send(new ChromeUtilityHostMsg_DecodeImage_Succeeded(decoded_image)); } UtilityThread::current()->ReleaseProcessIfNeeded(); } @@ -140,7 +145,7 @@ void ChromeContentUtilityClient::OnDecodeImageBase64( std::string decoded_string; if (!base::Base64Decode(encoded_string, &decoded_string)) { - Send(new UtilityHostMsg_DecodeImage_Failed()); + Send(new ChromeUtilityHostMsg_DecodeImage_Failed()); return; } @@ -168,12 +173,12 @@ void ChromeContentUtilityClient::OnRenderPDFPagesToMetafile( page_ranges, &highest_rendered_page_number); if (succeeded) { - Send(new UtilityHostMsg_RenderPDFPagesToMetafile_Succeeded( + Send(new ChromeUtilityHostMsg_RenderPDFPagesToMetafile_Succeeded( highest_rendered_page_number)); } #endif // defined(OS_WIN) if (!succeeded) { - Send(new UtilityHostMsg_RenderPDFPagesToMetafile_Failed()); + Send(new ChromeUtilityHostMsg_RenderPDFPagesToMetafile_Failed()); } UtilityThread::current()->ReleaseProcessIfNeeded(); } @@ -218,7 +223,7 @@ DWORD WINAPI UtilityProcess_GetFontDataPatch( if (GetObject(font, sizeof(LOGFONT), &logfont)) { std::vector<char> font_data; if (UtilityThread::current()->Send( - new UtilityHostMsg_PreCacheFont(logfont))) + new ChromeUtilityHostMsg_PreCacheFont(logfont))) rv = GetFontData(hdc, table, offset, buffer, length); } } @@ -325,9 +330,9 @@ void ChromeContentUtilityClient::OnParseJSON(const std::string& json) { if (value) { ListValue wrapper; wrapper.Append(value); - Send(new UtilityHostMsg_ParseJSON_Succeeded(wrapper)); + Send(new ChromeUtilityHostMsg_ParseJSON_Succeeded(wrapper)); } else { - Send(new UtilityHostMsg_ParseJSON_Failed(error)); + Send(new ChromeUtilityHostMsg_ParseJSON_Failed(error)); } UtilityThread::current()->ReleaseProcessIfNeeded(); } @@ -338,10 +343,11 @@ void ChromeContentUtilityClient::OnGetPrinterCapsAndDefaults( printing::PrintBackend::CreateInstance(NULL); printing::PrinterCapsAndDefaults printer_info; if (print_backend->GetPrinterCapsAndDefaults(printer_name, &printer_info)) { - Send(new UtilityHostMsg_GetPrinterCapsAndDefaults_Succeeded(printer_name, - printer_info)); + Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Succeeded( + printer_name, printer_info)); } else { - Send(new UtilityHostMsg_GetPrinterCapsAndDefaults_Failed(printer_name)); + Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed( + printer_name)); } UtilityThread::current()->ReleaseProcessIfNeeded(); } |