/C++ readability/ - Make Chromoting Host report crashes to Breakpad (Windows only). The user must e…

remoting/host/plugin/daemon_installer_win.cc

Index: remoting/host/plugin/daemon_installer_win.cc
diff --git a/remoting/host/plugin/daemon_installer_win.cc b/remoting/host/plugin/daemon_installer_win.cc
index 6eedd967f35bf19166b8eb813557554214c58d11..b5023144cffa5ca7dd1555f93c64e61d7564d4fb 100644
--- a/remoting/host/plugin/daemon_installer_win.cc
+++ b/remoting/host/plugin/daemon_installer_win.cc
@@ -24,6 +24,8 @@ namespace omaha {
 #include "google_update/google_update_idl.h"
 }  // namespace omaha

[Peter Kasting, 2012/06/14 20:16:27]

No other files in the project which #include this file put it in a namespace. 
Is this truly necessary?

I ask this because if we can eliminate this, the correct ordering of the
#includes (including the one you're adding) becomes clearer.

[alexeypa (please no reviews), 2012/06/15 18:45:49]

Unfortunately, the state constants declared in
"google_update/google_update_idl.h" conflict with constants defined in some
other header so I had to put this one into a namespace.

[Peter Kasting, 2012/06/15 19:02:42]

Which other header has the conflict?  Can we change the names declared there? 
(The google_update_idl.h things are autogenerated so changing them might be
trickier.)  Namespacing around a #include is something I really have never seen
other Chrome code do so I'd be willing to go to some length to avoid it.

[alexeypa (please no reviews), 2012/06/15 19:51:24]

It turns out there is no conflict anymore and omaha namespace is not needed at
all. I verified the compiled code has all proper jumps (just in case).

 
+#include "remoting/host/constants.h"
+
 using base::win::ScopedBstr;
 using base::win::ScopedComPtr;
 
@@ -44,10 +46,6 @@ const char16 kGoogleUpdateCommandLineFormat[] =
     TO_L_STRING("\"%ls\" /install \"bundlename=Chromoting%%20Host&appguid=%ls&")
     TO_L_STRING("appname=Chromoting%%20Host&needsadmin=True&lang=%ls\"");
 
-// The Omaha Appid of the host.
-const char16 kOmahaAppid[] =
-    TO_L_STRING("{b210701e-ffc4-49e3-932b-370728c72662}");
-
 // TODO(alexeypa): Get the desired laungage from the web app.
 const char16 kOmahaLanguage[] = TO_L_STRING("en");
 
@@ -143,7 +141,7 @@ void DaemonComInstallerWin::Install() {
   }
 
   // Add Chromoting Host to the bundle.
-  ScopedBstr appid(kOmahaAppid);
+  ScopedBstr appid(kHostOmahaAppid);
   ScopedBstr empty(kOmahaEmpty);
   ScopedBstr language(kOmahaLanguage);
   hr = bundle_->createApp(appid, empty, language, empty);
@@ -292,7 +290,7 @@ void DaemonCommandLineInstallerWin::Install() {
   string16 command_line =
       StringPrintf(kGoogleUpdateCommandLineFormat,
                    google_update.c_str(),
-                   kOmahaAppid,
+                   kHostOmahaAppid,
                    kOmahaLanguage);
 
   base::LaunchOptions options;