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

Unified Diff: chrome/browser/ui/webui/options/advanced_options_handler.cc

Issue 6955010: Remove the Remoting Host component from Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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: chrome/browser/ui/webui/options/advanced_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc
index b0ac0333a7bfe6b649625c5b14c1894f4cf01a47..2d35aaa3255f74fb20aef92a443ee0534d378036 100644
--- a/chrome/browser/ui/webui/options/advanced_options_handler.cc
+++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc
@@ -20,7 +20,6 @@
#include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
#include "chrome/browser/printing/cloud_print/cloud_print_url.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/remoting/setup_flow.h"
#include "chrome/browser/service/service_process_control.h"
#include "chrome/browser/service/service_process_control_manager.h"
#include "chrome/browser/ui/options/options_util.h"
@@ -163,14 +162,6 @@ void AdvancedOptionsHandler::GetLocalizedValues(
{ "cloudPrintProxyEnablingButton",
IDS_OPTIONS_CLOUD_PRINT_PROXY_ENABLING_BUTTON },
#endif
-#if defined(ENABLE_REMOTING)
- { "advancedSectionTitleRemoting",
- IDS_OPTIONS_ADVANCED_SECTION_TITLE_REMOTING },
- { "remotingSetupButton",
- IDS_OPTIONS_REMOTING_SETUP_BUTTON },
- { "remotingStopButton",
- IDS_OPTIONS_REMOTING_STOP_BUTTON },
-#endif
};
RegisterStrings(localized_strings, resources, arraysize(resources));
@@ -200,13 +191,6 @@ void AdvancedOptionsHandler::Initialize() {
RemoveCloudPrintProxySection();
}
#endif
-#if defined(ENABLE_REMOTING) && !defined(OS_CHROMEOS)
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableRemoting)) {
- RemoveRemotingSection();
- } else {
- remoting_options_handler_.Init(web_ui_);
- }
-#endif
banner_handler_.reset(
new OptionsManagedBannerHandler(web_ui_,
@@ -290,14 +274,6 @@ void AdvancedOptionsHandler::RegisterMessages() {
NewCallback(this,
&AdvancedOptionsHandler::ShowNetworkProxySettings));
#endif
-#if defined(ENABLE_REMOTING) && !defined(OS_CHROMEOS)
- web_ui_->RegisterMessageCallback("showRemotingSetupDialog",
- NewCallback(this,
- &AdvancedOptionsHandler::ShowRemotingSetupDialog));
- web_ui_->RegisterMessageCallback("disableRemoting",
- NewCallback(this,
- &AdvancedOptionsHandler::DisableRemoting));
-#endif
web_ui_->RegisterMessageCallback("checkRevocationCheckboxAction",
NewCallback(this,
&AdvancedOptionsHandler::HandleCheckRevocationCheckbox));
@@ -514,26 +490,6 @@ void AdvancedOptionsHandler::RemoveCloudPrintProxySection() {
#endif
-#if defined(ENABLE_REMOTING) && !defined(OS_CHROMEOS)
-void AdvancedOptionsHandler::RemoveRemotingSection() {
- web_ui_->CallJavascriptFunction(
- "options.AdvancedOptions.RemoveRemotingSection");
-}
-
-void AdvancedOptionsHandler::ShowRemotingSetupDialog(const ListValue* args) {
- remoting::SetupFlow::OpenSetupDialog(web_ui_->GetProfile());
-}
-
-void AdvancedOptionsHandler::DisableRemoting(const ListValue* args) {
- ServiceProcessControl* process_control =
- ServiceProcessControlManager::GetInstance()->GetProcessControl(
- web_ui_->GetProfile());
- if (!process_control || !process_control->is_connected())
- return;
- process_control->DisableRemotingHost();
-}
-#endif
-
void AdvancedOptionsHandler::SetupMetricsReportingCheckbox() {
#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
FundamentalValue checked(enable_metrics_recording_.GetValue());

Powered by Google App Engine
This is Rietveld 408576698