Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: installer/src/installer-lib/test/test-installer-lib-sandbox.cpp

Issue 5219280069066752: Issue #1186 - Change names that appear in the custom action (Closed)
Patch Set: Created Oct. 15, 2014, 3:29 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « installer/src/installer-lib/test/test-installer-lib-ca.def ('k') | installer/src/msi/adblockplusie.wxs » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: installer/src/installer-lib/test/test-installer-lib-sandbox.cpp
===================================================================
--- a/installer/src/installer-lib/test/test-installer-lib-sandbox.cpp
+++ b/installer/src/installer-lib/test/test-installer-lib-sandbox.cpp
@@ -24,10 +24,10 @@
//-------------------------------------------------------
class log_single_window_handle
{
- Immediate_Session & session ;
+ ImmediateSession & session ;
public:
- log_single_window_handle( Immediate_Session & session )
+ log_single_window_handle( ImmediateSession & session )
: session( session )
{
}
@@ -41,7 +41,7 @@
}
} ;
-void log_all_window_handles( Immediate_Session & session )
+void log_all_window_handles( ImmediateSession & session )
{
session.log( "log_all_window_handles" ) ;
log_single_window_handle lp( session ) ;
@@ -53,12 +53,12 @@
//-------------------------------------------------------
class log_single_window_handle_only_if_IE
{
- Immediate_Session & session ;
+ ImmediateSession & session ;
- Process_Closer & pc ;
+ ProcessCloser & pc ;
public:
- log_single_window_handle_only_if_IE( Immediate_Session & session, Process_Closer & pc )
+ log_single_window_handle_only_if_IE( ImmediateSession & session, ProcessCloser & pc )
: session( session ), pc( pc )
{
}
@@ -76,12 +76,12 @@
}
} ;
-void log_IE_window_handles( Immediate_Session & session )
+void log_IE_window_handles( ImmediateSession & session )
{
session.log( "log_IE_window_handles" ) ;
const wchar_t * IE_names[] = { L"IExplore.exe", L"AdblockPlusEngine.exe" } ;
- Process_Snapshot snapshot ;
- Process_Closer iec(snapshot, IE_names) ;
+ ProcessSnapshot snapshot ;
+ ProcessCloser iec(snapshot, IE_names) ;
log_single_window_handle_only_if_IE lp( session, iec ) ;
enumerate_windows( lp ) ;
}
@@ -89,12 +89,12 @@
//-------------------------------------------------------
// log_only_window_handle_in_closer
//-------------------------------------------------------
-void log_only_window_handle_in_closer( Immediate_Session & session )
+void log_only_window_handle_in_closer( ImmediateSession & session )
{
session.log( "log_only_window_handle_in_closer" ) ;
const wchar_t * IE_names[] = { L"IExplore.exe", L"AdblockPlusEngine.exe" } ;
- Process_Snapshot snapshot ;
- Process_Closer iec( snapshot, IE_names) ;
+ ProcessSnapshot snapshot ;
+ ProcessCloser iec( snapshot, IE_names) ;
iec.iterate_our_windows( log_single_window_handle( session ) ) ;
}
@@ -117,7 +117,7 @@
extern "C" UINT __stdcall
sandbox( MSIHANDLE session_handle )
{
- Immediate_Session session( session_handle, "sandbox" ) ;
+ ImmediateSession session( session_handle, "sandbox" ) ;
try
{
@@ -126,12 +126,12 @@
}
catch( std::exception & e )
{
- session.log_noexcept( "terminated by exception: " + std::string( e.what() ) ) ;
+ session.LogNoexcept( "terminated by exception: " + std::string( e.what() ) ) ;
return ERROR_INSTALL_FAILURE ;
}
catch( ... )
{
- session.log_noexcept( "Caught an exception" ) ;
+ session.LogNoexcept( "Caught an exception" ) ;
return ERROR_INSTALL_FAILURE ;
}
« no previous file with comments | « installer/src/installer-lib/test/test-installer-lib-ca.def ('k') | installer/src/msi/adblockplusie.wxs » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld