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

Side by Side Diff: installer/src/custom-action/close_application.cpp

Issue 6003395731128320: Only take into account processes that have our plugin loaded (Closed)
Patch Set: Addressing comments Created March 28, 2014, 12:45 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « installer/installer.gyp ('k') | installer/src/installer-lib/process.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /** 1 /**
2 * \file close_application.cpp 2 * \file close_application.cpp
3 */ 3 */
4 4
5 #include <algorithm> 5 #include <algorithm>
6 6
7 #include "session.h" 7 #include "session.h"
8 #include "property.h" 8 #include "property.h"
9 #include "database.h" 9 #include "database.h"
10 #include "process.h" 10 #include "process.h"
11 #include "interaction.h" 11 #include "interaction.h"
12 #include "custom-i18n.h" 12 #include "custom-i18n.h"
13 13
14 //------------------------------------------------------- 14 //-------------------------------------------------------
15 //------------------------------------------------------- 15 //-------------------------------------------------------
16 class IE_Closer 16 class IE_Closer
17 { 17 {
18 Snapshot snapshot ; 18 Snapshot snapshot ;
19 19
20 Process_Closer ie_closer ; 20 Process_Closer ie_closer ;
21 21
22 Process_Closer engine_closer ; 22 Process_Closer engine_closer ;
23 23
24 static const wchar_t * ie_names[] ; 24 static const wchar_t * ie_names[] ;
25 static const wchar_t * engine_names[] ; 25 static const wchar_t * engine_names[] ;
26 static const wchar_t * abp_module_names[] ;
26 27
27 public: 28 public:
28 IE_Closer() 29 IE_Closer()
29 : snapshot(), ie_closer( snapshot, ie_names, 1 ), engine_closer( snapshot, e ngine_names, 1 ) 30 : snapshot(), ie_closer( snapshot, ie_names, 1, abp_module_names, 2 ), engin e_closer( snapshot, engine_names, 1, NULL, 0 )
30 {} 31 {}
31 32
32 void refresh() 33 void refresh()
33 { 34 {
34 snapshot.refresh() ; 35 snapshot.refresh() ;
35 ie_closer.refresh() ; 36 ie_closer.refresh() ;
36 engine_closer.refresh() ; 37 engine_closer.refresh() ;
37 } 38 }
38 39
39 bool is_running() 40 bool is_running()
(...skipping 14 matching lines...) Expand all
54 // Assert the engine is still running 55 // Assert the engine is still running
55 // This is after IE has shut down itself and after we've tried to shut dow n the engine. Whatever. 56 // This is after IE has shut down itself and after we've tried to shut dow n the engine. Whatever.
56 return false ; 57 return false ;
57 } 58 }
58 return true ; 59 return true ;
59 } 60 }
60 } ; 61 } ;
61 62
62 const wchar_t * IE_Closer::ie_names[] = { L"IExplore.exe" } ; 63 const wchar_t * IE_Closer::ie_names[] = { L"IExplore.exe" } ;
63 const wchar_t * IE_Closer::engine_names[] = { L"AdblockPlusEngine.exe" } ; 64 const wchar_t * IE_Closer::engine_names[] = { L"AdblockPlusEngine.exe" } ;
65 const wchar_t * IE_Closer::abp_module_names[] = { L"AdblockPlus32.dll", L"Adbloc kPlus64.dll" } ;
64 66
65 //------------------------------------------------------- 67 //-------------------------------------------------------
66 // abp_close_ie 68 // abp_close_ie
67 //------------------------------------------------------- 69 //-------------------------------------------------------
68 /** 70 /**
69 * Exposed DLL entry point for custom action. 71 * Exposed DLL entry point for custom action.
70 * The function signature matches the calling convention used by Windows Install er. 72 * The function signature matches the calling convention used by Windows Install er.
71 * 73 *
72 * This function supports four policy stances with respect to a running IE proce ss. 74 * This function supports four policy stances with respect to a running IE proce ss.
73 * 75 *
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 return TRUE ; 453 return TRUE ;
452 } 454 }
453 455
454 /** 456 /**
455 * Windows_List 457 * Windows_List
456 */ 458 */
457 class Window_List { 459 class Window_List {
458 public: 460 public:
459 void enumerate_top_level(); 461 void enumerate_top_level();
460 }; 462 };
OLDNEW
« no previous file with comments | « installer/installer.gyp ('k') | installer/src/installer-lib/process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld