Making the me2me host compiling and running on Windows. This includes making it a window applicatio…

remoting/host/simple_host_process.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This is an application of a minimal host process in a Chromoting
 // system. It serves the purpose of gluing different pieces together
 // to make a functional host process for testing.
 //
 // It peforms the following functionality:
 // 1. Connect to the GTalk network and register the machine as a host.
 // 2. Accepts connection through libjingle.
 // 3. Receive mouse / keyboard events through libjingle.
 // 4. Sends screen capture through libjingle.
 
 #include <iostream>
 #include <string>
 
 #include "build/build_config.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "base/environment.h"
 #include "base/file_path.h"
+#include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "crypto/nss_util.h"
 #include "net/base/network_change_notifier.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/capturer_fake.h"
@@ skipping 26 matching lines @@
 
 using remoting::protocol::CandidateSessionConfig;
 using remoting::protocol::ChannelConfig;
 using remoting::protocol::NetworkSettings;
 
 namespace {
 
 const FilePath::CharType kDefaultConfigPath[] =
     FILE_PATH_LITERAL(".ChromotingConfig.json");
 
-const char kHomeDrive[] = "HOMEDRIVE";
-const char kHomePath[] = "HOMEPATH";
-
 const char kFakeSwitchName[] = "fake";
 const char kIT2MeSwitchName[] = "it2me";
 const char kConfigSwitchName[] = "config";
 const char kVideoSwitchName[] = "video";
 const char kDisableNatTraversalSwitchName[] = "disable-nat-traversal";
 const char kMinPortSwitchName[] = "min-port";
 const char kMaxPortSwitchName[] = "max-port";
 
 const char kVideoSwitchValueVerbatim[] = "verbatim";
 const char kVideoSwitchValueZip[] = "zip";
@@ skipping 99 matching lines @@
     } else {
       LOG(ERROR) << "If you haven't done so recently, try running"
                  << " remoting/tools/register_host.py.";
     }
   }
 
   FilePath GetConfigPath() {
     if (!config_path_.empty())
       return config_path_;
 
-    scoped_ptr<base::Environment> env(base::Environment::Create());
+    FilePath config_path;
 
 #if defined(OS_WIN)
-    std::string home_drive;
-    env->GetVar(kHomeDrive, &home_drive);
-    std::string home_path;
-    env->GetVar(kHomePath, &home_path);
-    return FilePath(UTF8ToWide(home_drive))
-        .Append(UTF8ToWide(home_path))
-        .Append(kDefaultConfigPath);
+    PathService::Get(base::DIR_PROFILE, &config_path);

[Wez, 2012/03/01 18:03:06]

This change moves the config from the home directory to the profile, so the CL
description should mention that.

[Jamie, 2012/03/01 18:22:32]

Better still, unless that change is required for this CL to work, split it into
a separate one.

[alexeypa (please no reviews), 2012/03/01 20:33:58]

This change does not change the location. There is no GetHomeDir()
implementation for Windows (for a reason). The homegrown implementation we had
was using the user profile folder as the home dir.

Actually this is something that we need to address later. Windows guidelines do
not recommend putting files to the profile folder. So we will need to move the
files to %LOCALAPPDATA% to make it more Windowsy.

[Wez, 2012/03/01 21:11:36]

The home-grown code was using HOMEDRIVE and HOMEPATH, rather than USERPROFILE.
PathService::Get(DIR_LOCAL_APP_DATA, ...) should achieve that.

[alexeypa (please no reviews), 2012/03/01 22:32:41]

Yes, I saw that. They can only be different if you change them after login, if
I'm not mistaken. Which is the same thing as changing HOME on Linux. It will
break things.
Yes. We'll need to come up with a better name than ".config" anyway. So I'll
better remove this file from this CL for now.

PS. You guys are so picky. :-)

[Wez, 2012/03/01 22:46:30]

Nope.  The home directory and profile directory can differ.  :)
:D

 #else
-    std::string home_path;
-    env->GetVar(base::env_vars::kHome, &home_path);
-    return FilePath(home_path).Append(kDefaultConfigPath);
+    config_path = file_util::GetHomeDir();
 #endif
+
+    return config_path.Append(kDefaultConfigPath);
   }
 
   void StartHost() {
     signal_strategy_.reset(
         new XmppSignalStrategy(context_.jingle_thread(), xmpp_login_,
                                xmpp_auth_token_, xmpp_auth_service_));
     signaling_connector_.reset(new SignalingConnector(signal_strategy_.get()));
 
     if (fake_) {
       Capturer* capturer = new CapturerFake();
@@ skipping 149 matching lines @@
         max_port < 0 || max_port > 65535) {
       LOG(ERROR) << "Invalid max-port value: " << max_port
                  << ". Expected integer in range [0, 65535].";
       return 1;
     }
     simple_host.network_settings()->max_port = max_port;
   }
 
   return simple_host.Run();
 }