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

Unified Diff: remoting/host/host_main.cc

Issue 19803010: Localized Chromoting Host on Mac and Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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
Index: remoting/host/host_main.cc
diff --git a/remoting/host/host_main.cc b/remoting/host/host_main.cc
index 7f00000f87f5e1e13649996f1aeb37da29858443..a5b1d5570cd270084f7327100ba1033eb496781b 100644
--- a/remoting/host/host_main.cc
+++ b/remoting/host/host_main.cc
@@ -17,6 +17,7 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "remoting/base/breakpad.h"
+#include "remoting/base/resources.h"
#include "remoting/host/host_exit_codes.h"
#include "remoting/host/logging.h"
#include "remoting/host/usage_stats_consent.h"
@@ -232,11 +233,24 @@ int HostMain(int argc, char** argv) {
return kUsageExitCode;
}
+ // .pak files are not used on Windows. Linux me2me host does not present any
+ // UI yet.
+#if !defined(OS_WIN) && !defined(OS_LINUX)
Sergey Ulanov 2013/07/23 22:45:40 Can we always call LoadResources() and platform-sp
alexeypa (please no reviews) 2013/07/23 23:35:26 Will do.
+ remoting::LoadResources("");
+#endif // !defined(OS_WIN)
+
// Invoke the entry point.
int exit_code = main_routine();
if (exit_code == kUsageExitCode) {
Usage(command_line->GetProgram());
}
+
+ // Do not use .pak files on Windows. Linux me2me host does not present any
+ // UI yet.
+#if !defined(OS_WIN)
+ remoting::UnloadResources();
+#endif // !defined(OS_WIN)
+
return exit_code;
}

Powered by Google App Engine
This is Rietveld 408576698