2 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc
index 44033b7c..c156220 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc
@@ -187,6 +187,8 @@ void AdvancedOptionsHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_REMOTING));
   localized_strings->SetString("remotingSetupButton",
       l10n_util::GetStringUTF16(IDS_OPTIONS_REMOTING_SETUP_BUTTON));
+  localized_strings->SetString("remotingStopButton",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_REMOTING_STOP_BUTTON));
 #endif
   localized_strings->SetString("enableLogging",
       l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_LOGGING));
@@ -218,6 +220,8 @@ void AdvancedOptionsHandler::Initialize() {
 #if defined(ENABLE_REMOTING) && !defined(OS_CHROMEOS)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableRemoting)) {
     RemoveRemotingSection();
+  } else {
+    remoting_options_handler_.Init(dom_ui_);
   }
 #endif
 
diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.h b/chrome/browser/dom_ui/options/advanced_options_handler.h
index 033cb85..a400ea8 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.h
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.h
@@ -10,6 +10,7 @@
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
+#include "chrome/browser/remoting/remoting_options_handler.h"
 #include "chrome/browser/shell_dialogs.h"
 
 class OptionsManagedBannerHandler;
@@ -153,6 +154,10 @@ class AdvancedOptionsHandler
   bool cloud_print_proxy_ui_enabled_;
 #endif
 
+#if defined(ENABLE_REMOTING) && !defined(OS_CHROMEOS)
+  remoting::RemotingOptionsHandler remoting_options_handler_;
+#endif
+
   FilePathPrefMember default_download_location_;
   StringPrefMember auto_open_files_;
   IntegerPrefMember default_font_size_;