summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-17 01:37:21 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-17 01:37:21 +0000
commite5adb903876353423b7f6faeb021e1445752391b (patch)
tree3c836dc783bdbcc03757e1b3707616e7e847f06d /remoting
parentaf7845d425450de4d235f205d534671173058485 (diff)
downloadchromium_src-e5adb903876353423b7f6faeb021e1445752391b.zip
chromium_src-e5adb903876353423b7f6faeb021e1445752391b.tar.gz
chromium_src-e5adb903876353423b7f6faeb021e1445752391b.tar.bz2
Native remoting host configurer for linux.
This is initial version of the remoting host configurer for linux. It doesn't look pretty yet, but it works. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=167794 Review URL: https://codereview.chromium.org/11260004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/base/resources.cc4
-rw-r--r--remoting/base/resources.h6
-rw-r--r--remoting/remoting.gyp26
-rw-r--r--remoting/resources/string_resources.grd4
4 files changed, 35 insertions, 5 deletions
diff --git a/remoting/base/resources.cc b/remoting/base/resources.cc
index 32e62c4..a43e328 100644
--- a/remoting/base/resources.cc
+++ b/remoting/base/resources.cc
@@ -17,14 +17,14 @@ const char kCommonResourcesFileName[] = "chrome_remote_desktop.pak";
} // namespace
// Loads chromoting resources.
-bool LoadResources(const std::string& locale) {
+bool LoadResources(const std::string& pref_locale) {
FilePath path;
if (!PathService::Get(base::DIR_MODULE, &path))
return false;
PathService::Override(ui::DIR_LOCALES,
path.AppendASCII(kLocaleResourcesDirName));
- ui::ResourceBundle::InitSharedInstanceLocaleOnly(locale, NULL);
+ ui::ResourceBundle::InitSharedInstanceLocaleOnly(pref_locale, NULL);
ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
path.AppendASCII(kCommonResourcesFileName), ui::SCALE_FACTOR_100P);
diff --git a/remoting/base/resources.h b/remoting/base/resources.h
index a8fdfd6..b08eb8d 100644
--- a/remoting/base/resources.h
+++ b/remoting/base/resources.h
@@ -9,8 +9,10 @@
namespace remoting {
-// Loads chromoting resources. Returns false in case of a failure.
-bool LoadResources(const std::string& locale);
+// Loads chromoting resources. Returns false in case of a failure. |pref_locale|
+// is passed to l10n_util::GetApplicationLocale(), so the default system locale
+// is used if |pref_locale| is empty.
+bool LoadResources(const std::string& pref_locale);
} // namespace remoting
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 7dabdd1..d70bd1a 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -237,7 +237,7 @@
},
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" and chromeos==0', {
'targets': [
# Linux breakpad processing
{
@@ -285,6 +285,30 @@
'host/setup/start_host.cc',
],
}, # end of target 'remoting_start_host'
+ {
+ 'target_name': 'remoting_configurer',
+ 'type': 'executable',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'cflags': [
+ '<!@(pkg-config --cflags webkit-1.0)',
+ ],
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other webkit-1.0)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l webkit-1.0)',
+ ],
+ },
+ 'dependencies': [
+ '../base/base.gyp:base',
+ 'remoting_host_setup_base',
+ 'remoting_resources'
+ ],
+ 'sources': [
+ 'host/setup/linux/linux_host_setup_wizard.cc',
+ ],
+ }, # end of target 'remoting_configurer'
], # end of 'targets'
}], # 'OS=="linux"'
diff --git a/remoting/resources/string_resources.grd b/remoting/resources/string_resources.grd
index a60673b..e7d5e00 100644
--- a/remoting/resources/string_resources.grd
+++ b/remoting/resources/string_resources.grd
@@ -513,6 +513,10 @@
<message desc="Help link displayed when the user enables the host on this computer. Clicking this link opens a page that explains why this operation is safe. This string appears in a UI with limited horizontal space. Please try to keep translations no more than about 30 characters." name="IDR_WHY_IS_THIS_SAFE">
Why is this safe?
</message>
+
+ <message name="IDR_HOST_NOT_STARTED" desc="Message displayed when the current computer is not accepting remote connections, instructing the user how to enable them.">
+ Remote access to this computer is disabled.
+ </message>
</messages>
</release>
</grit>