diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 02:24:43 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 02:24:43 +0000 |
| commit | ff517c9129a429439d94eb42cddb15e9bf1c2e16 (patch) | |
| tree | 6d8b74bab0d37762f8c93dc240a24dc08db7aa39 /chrome/browser/dom_ui | |
| parent | f9108947ec8e6ed2c8b4fe98613a9fac09973a48 (diff) | |
| download | chromium_src-ff517c9129a429439d94eb42cddb15e9bf1c2e16.zip chromium_src-ff517c9129a429439d94eb42cddb15e9bf1c2e16.tar.gz chromium_src-ff517c9129a429439d94eb42cddb15e9bf1c2e16.tar.bz2 | |
Show remoting host status on the advanced options page.
BUG=67218
TEST=Remoting status is shown on the advanced options page.
Review URL: http://codereview.chromium.org/6214003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/options/advanced_options_handler.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/options/advanced_options_handler.h | 5 |
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_; |