summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 18:19:32 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 18:19:32 +0000
commitbb76fd4253554e9e622f85aa68bbf6a092cb1481 (patch)
tree39ad412ccd8c0a9d4099e7af9847586420bc1db1 /chrome/common
parent13bbbd19b7e90b1b4c3449f8945aab132eec8767 (diff)
downloadchromium_src-bb76fd4253554e9e622f85aa68bbf6a092cb1481.zip
chromium_src-bb76fd4253554e9e622f85aa68bbf6a092cb1481.tar.gz
chromium_src-bb76fd4253554e9e622f85aa68bbf6a092cb1481.tar.bz2
Remove the Remoting Host component from Chrome.
* Update the Remoting feature flag description. * Fix license headers. * Remove files from gyp definitions. * Remove Chromoting trigger for Service Process launch on browser startup, and Chromoting setup HTML resources. * Remove Chromoting Host registration components from Browser. * Remove resources for Chromoting Host options UI. * Remove Service Process control APIs for Chromoting Host. * Remove Chromoting Host prefs from Browser UI. * Remove WebUI for Chromoting Host. * Remove WebUI options for Chromoting Host. * Remove Chromoting Host policy options, and don't warn if Chromoting is entirely disabled by policy, since there are no user-visible settings for it anyway. * Remove Chromoting Host preference names, service IPCs and URL constants. * Remove Chromoting Host from Service Process. * Remove remoting strings, locale settings and setup "Id". BUG= TEST=Run Service Process from a profile in which Chromoting Host had previously been configured, and Cloud Print NOT configured. Chromoting Host should not be accessible, and Service Process should quit after about a minute. Review URL: http://codereview.chromium.org/6955010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/pref_names.cc16
-rw-r--r--chrome/common/pref_names.h7
-rw-r--r--chrome/common/remoting/chromoting_host_info.cc15
-rw-r--r--chrome/common/remoting/chromoting_host_info.h26
-rw-r--r--chrome/common/service_messages.h29
-rw-r--r--chrome/common/url_constants.cc2
-rw-r--r--chrome/common/url_constants.h2
7 files changed, 1 insertions, 96 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 94204c5..baf048d 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -929,17 +929,6 @@ const char kSelectFileLastDirectory[] = "selectfile.last_directory";
// Boolean that specifies if file selection dialogs are shown.
const char kAllowFileSelectionDialogs[] = "select_file_dialogs.allowed";
-// Boolean that specifies if remote access features are allowed.
-const char kChromotingEnabled[] = "chromoting.enabled";
-
-// Boolean that specifies if machine is allowed to be shared for remote access.
-const char kChromotingHostEnabled[] = "chromoting.host_enabled";
-
-// Boolean that specifies if a machine that is shared for remote access is
-// is allowed to accept connections from across a firewall.
-const char kChromotingHostFirewallTraversal[] =
- "chromoting.host_firewall_traversal";
-
// Extensions which should be opened upon completion.
const char kDownloadExtensionsToOpen[] = "download.extensions_to_open";
@@ -1254,8 +1243,6 @@ const char kCloudPrintServiceURL[] = "cloud_print.service_url";
const char kCloudPrintDialogWidth[] = "cloud_print.dialog_size.width";
const char kCloudPrintDialogHeight[] = "cloud_print.dialog_size.height";
-const char kRemotingHasSetupCompleted[] = "remoting.has_setup_completed";
-
// The list of BackgroundContents that should be loaded when the browser
// launches.
const char kRegisteredBackgroundContents[] = "background_contents.registered";
@@ -1315,9 +1302,6 @@ const char kCloudPrintEnableJobPoll[] = "cloud_print.enable_job_poll";
const char kCloudPrintRobotRefreshToken[] = "cloud_print.robot_refresh_token";
const char kCloudPrintRobotEmail[] = "cloud_print.robot_email";
-// Used by the service process to determine if the remoting host is enabled.
-const char kRemotingHostEnabled[] = "remoting.host_enabled";
-
// Preference to story proxy settings.
const char kProxy[] = "proxy";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index dc3dfed..bae339b 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -322,10 +322,6 @@ extern const char kSaveFileType[];
extern const char kAllowFileSelectionDialogs[];
-extern const char kChromotingEnabled[];
-extern const char kChromotingHostEnabled[];
-extern const char kChromotingHostFirewallTraversal[];
-
extern const char kSelectFileLastDirectory[];
extern const char kHungPluginDetectFrequency[];
@@ -462,9 +458,6 @@ extern const char kCloudPrintEnableJobPoll[];
extern const char kCloudPrintRobotRefreshToken[];
extern const char kCloudPrintRobotEmail[];
-extern const char kRemotingHasSetupCompleted[];
-extern const char kRemotingHostEnabled[];
-
extern const char kProxy[];
extern const char kManagedDefaultCookiesSetting[];
diff --git a/chrome/common/remoting/chromoting_host_info.cc b/chrome/common/remoting/chromoting_host_info.cc
deleted file mode 100644
index acb0ce5..0000000
--- a/chrome/common/remoting/chromoting_host_info.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2011 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.
-
-#include "chrome/common/remoting/chromoting_host_info.h"
-
-namespace remoting {
-
-ChromotingHostInfo::ChromotingHostInfo()
- : enabled(false) {
-}
-
-ChromotingHostInfo::~ChromotingHostInfo() {}
-
-} // namespace remoting
diff --git a/chrome/common/remoting/chromoting_host_info.h b/chrome/common/remoting/chromoting_host_info.h
deleted file mode 100644
index f1816da..0000000
--- a/chrome/common/remoting/chromoting_host_info.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2010 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.
-
-#ifndef CHROME_COMMON_REMOTING_CHROMOTING_HOST_INFO_H_
-#define CHROME_COMMON_REMOTING_CHROMOTING_HOST_INFO_H_
-
-#include <string>
-
-namespace remoting {
-
-// This struct is used for ServiceHostMsg_ChromotingHost_Info IPC message.
-struct ChromotingHostInfo {
- ChromotingHostInfo();
- ~ChromotingHostInfo();
-
- std::string host_id;
- std::string hostname;
- std::string public_key;
- std::string login;
- bool enabled;
-};
-
-} // namespace remoting
-
-#endif // CHROME_COMMON_REMOTING_CHROMOTING_HOST_INFO_H_
diff --git a/chrome/common/service_messages.h b/chrome/common/service_messages.h
index 9d15df4..faf5b1a 100644
--- a/chrome/common/service_messages.h
+++ b/chrome/common/service_messages.h
@@ -1,24 +1,15 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
// Multiply-included message file, no traditional include guard.
#include <string>
-#include "chrome/common/remoting/chromoting_host_info.h"
#include "ipc/ipc_channel_handle.h"
#include "ipc/ipc_message_macros.h"
#define IPC_MESSAGE_START ServiceMsgStart
-IPC_STRUCT_TRAITS_BEGIN(remoting::ChromotingHostInfo)
- IPC_STRUCT_TRAITS_MEMBER(host_id)
- IPC_STRUCT_TRAITS_MEMBER(hostname)
- IPC_STRUCT_TRAITS_MEMBER(public_key)
- IPC_STRUCT_TRAITS_MEMBER(enabled)
- IPC_STRUCT_TRAITS_MEMBER(login)
-IPC_STRUCT_TRAITS_END()
-
//-----------------------------------------------------------------------------
// Service process messages:
// These are messages from the browser to the service process.
@@ -38,20 +29,6 @@ IPC_MESSAGE_CONTROL0(ServiceMsg_DisableCloudPrintProxy)
// enabled.
IPC_MESSAGE_CONTROL0(ServiceMsg_IsCloudPrintProxyEnabled)
-// Set credentials used by the RemotingHost.
-IPC_MESSAGE_CONTROL2(ServiceMsg_SetRemotingHostCredentials,
- std::string, /* username */
- std::string /* token for XMPP */)
-
-// Enabled remoting host.
-IPC_MESSAGE_CONTROL0(ServiceMsg_EnableRemotingHost)
-
-// Disable remoting host.
-IPC_MESSAGE_CONTROL0(ServiceMsg_DisableRemotingHost)
-
-// Get remoting host status information.
-IPC_MESSAGE_CONTROL0(ServiceMsg_GetRemotingHostInfo)
-
// Tell the service process to shutdown.
IPC_MESSAGE_CONTROL0(ServiceMsg_Shutdown)
@@ -68,7 +45,3 @@ IPC_MESSAGE_CONTROL0(ServiceHostMsg_CloudPrintProxy_AuthError)
IPC_MESSAGE_CONTROL2(ServiceHostMsg_CloudPrintProxy_IsEnabled,
bool, /* Is the proxy enabled? */
std::string /* Email address of account */)
-
-IPC_MESSAGE_CONTROL1(ServiceHostMsg_RemotingHost_HostInfo,
- remoting::ChromotingHostInfo /* host_info */)
-
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 60ed6ce..33fcb99 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -120,8 +120,6 @@ const char kChromeUINetInternalsHost[] = "net-internals";
const char kChromeUINewTabHost[] = "newtab";
const char kChromeUIPluginsHost[] = "plugins";
const char kChromeUIPrintHost[] = "print";
-const char kChromeUIRemotingHost[] = "remoting";
-const char kChromeUIRemotingResourcesHost[] = "remotingresources";
const char kChromeUIResourcesHost[] = "resources";
const char kChromeUIScreenshotPath[] = "screenshots";
const char kChromeUISettingsHost[] = "settings";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 3b4e50a0..8d030d2 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -109,8 +109,6 @@ extern const char kChromeUINetInternalsHost[];
extern const char kChromeUINewTabHost[];
extern const char kChromeUIPluginsHost[];
extern const char kChromeUIPrintHost[];
-extern const char kChromeUIRemotingHost[];
-extern const char kChromeUIRemotingResourcesHost[];
extern const char kChromeUIResourcesHost[];
extern const char kChromeUIScreenshotPath[];
extern const char kChromeUISettingsHost[];