Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: cloud_print/service/win/cloud_print_service_config.cc

Issue 14358019: Added Cloud Print Service installer/uninstaller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cloud_print/service/win/cloud_print_service.cc ('k') | cloud_print/service/win/installer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cloud_print/service/win/cloud_print_service_config.cc
diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc
index eff74f755e3801fd0135dd7cc95b940a59c8fcf6..84598b549517b60af613347cdfe27725040e97c1 100644
--- a/cloud_print/service/win/cloud_print_service_config.cc
+++ b/cloud_print/service/win/cloud_print_service_config.cc
@@ -17,6 +17,7 @@
#include "cloud_print/resources.h"
#include "cloud_print/service/service_state.h"
#include "cloud_print/service/win/chrome_launcher.h"
+#include "cloud_print/service/win/installer.h"
#include "cloud_print/service/win/service_controller.h"
#include "cloud_print/service/win/service_utils.h"
#include "cloud_print/service/win/setup_listener.h"
@@ -201,8 +202,7 @@ LRESULT SetupDialog::OnInitDialog(UINT message, WPARAM wparam, LPARAM lparam,
ATLVERIFY(CenterWindow());
WTL::CIcon icon;
- if (icon.LoadIcon(MAKEINTRESOURCE(IDI_ICON), GetSystemMetrics(SM_CXSMICON),
- GetSystemMetrics(SM_CYSMICON), 0)) {
+ if (icon.LoadIcon(MAKEINTRESOURCE(IDI_ICON))) {
SetIcon(icon);
}
@@ -428,6 +428,10 @@ int WINAPI WinMain(__in HINSTANCE hInstance,
base::AtExitManager at_exit;
CommandLine::Init(0, NULL);
+ HRESULT result = ProcessInstallerSwitches();
+ if (result != S_FALSE)
+ return result;
+
MessageLoopForUI loop;
scoped_refptr<SetupDialog> dialog(new SetupDialog());
dialog->Create(NULL);
« no previous file with comments | « cloud_print/service/win/cloud_print_service.cc ('k') | cloud_print/service/win/installer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698