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

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

Issue 29329159: Issue #1185 - Fix formatting in installer-lib and its tests (Closed)
Patch Set: Created Oct. 15, 2015, 7:03 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/src/custom-action/abp_ca.rc ('k') | installer/src/installer-lib/DLL.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"
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 * We first shut down IE, or at least attempt to. 361 * We first shut down IE, or at least attempt to.
362 * 362 *
363 * Succeeded -> Goto success 363 * Succeeded -> Goto success
364 * Failed && interactive -> 364 * Failed && interactive ->
365 * Ask user if they would like to try again 365 * Ask user if they would like to try again
366 * Retry -> re-enter this state 366 * Retry -> re-enter this state
367 * Cancel -> Goto notKnown 367 * Cancel -> Goto notKnown
368 * Failed && not interactive -> Goto abort 368 * Failed && not interactive -> Goto abort
369 */ 369 */
370 { 370 {
371 » bool ieWasClosed = iec.ShutDown(session); 371 bool ieWasClosed = iec.ShutDown(session);
372 if (iec.IsRunning()) 372 if (iec.IsRunning())
373 { 373 {
374 session.Log("Attempt to shut down IE automatically failed."); 374 session.Log("Attempt to shut down IE automatically failed.");
375 if (interactive) 375 if (interactive)
376 { 376 {
377 // Assert Interactive session and IE did not shut down. 377 // Assert Interactive session and IE did not shut down.
378 int x = session.WriteMessage(IMB( 378 int x = session.WriteMessage(IMB(
379 messageText.Text(L"dialog_automatic_retry"), 379 messageText.Text(L"dialog_automatic_retry"),
380 IMB::Box::warning, IMB::ButtonSet::retryCancel, IMB::DefaultButt on::one)); 380 IMB::Box::warning, IMB::ButtonSet::retryCancel, IMB::DefaultButt on::one));
381 switch (x) 381 switch (x)
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 return ERROR_INSTALL_FAILURE; 436 return ERROR_INSTALL_FAILURE;
437 } 437 }
438 catch (...) 438 catch (...)
439 { 439 {
440 session.LogNoexcept("terminated by unknown exception"); 440 session.LogNoexcept("terminated by unknown exception");
441 return ERROR_INSTALL_FAILURE; 441 return ERROR_INSTALL_FAILURE;
442 } 442 }
443 // Should be unreachable. 443 // Should be unreachable.
444 return ERROR_INSTALL_FAILURE; 444 return ERROR_INSTALL_FAILURE;
445 } 445 }
OLDNEW
« no previous file with comments | « installer/src/custom-action/abp_ca.rc ('k') | installer/src/installer-lib/DLL.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld