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

Side by Side Diff: chrome/browser/dom_ui/options/advanced_options_handler.cc

Issue 6214003: Show remoting host status on the advanced options page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/remoting/tools
Patch Set: git try Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/dom_ui/options/advanced_options_handler.h" 5 #include "chrome/browser/dom_ui/options/advanced_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 l10n_util::GetStringUTF16( 180 l10n_util::GetStringUTF16(
181 IDS_OPTIONS_CLOUD_PRINT_PROXY_ENABLED_MANAGE_BUTTON)); 181 IDS_OPTIONS_CLOUD_PRINT_PROXY_ENABLED_MANAGE_BUTTON));
182 localized_strings->SetString("cloudPrintProxyEnablingButton", 182 localized_strings->SetString("cloudPrintProxyEnablingButton",
183 l10n_util::GetStringUTF16(IDS_OPTIONS_CLOUD_PRINT_PROXY_ENABLING_BUTTON)); 183 l10n_util::GetStringUTF16(IDS_OPTIONS_CLOUD_PRINT_PROXY_ENABLING_BUTTON));
184 #endif 184 #endif
185 #if defined(ENABLE_REMOTING) 185 #if defined(ENABLE_REMOTING)
186 localized_strings->SetString("advancedSectionTitleRemoting", 186 localized_strings->SetString("advancedSectionTitleRemoting",
187 l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_REMOTING)); 187 l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_REMOTING));
188 localized_strings->SetString("remotingSetupButton", 188 localized_strings->SetString("remotingSetupButton",
189 l10n_util::GetStringUTF16(IDS_OPTIONS_REMOTING_SETUP_BUTTON)); 189 l10n_util::GetStringUTF16(IDS_OPTIONS_REMOTING_SETUP_BUTTON));
190 localized_strings->SetString("remotingStopButton",
191 l10n_util::GetStringUTF16(IDS_OPTIONS_REMOTING_STOP_BUTTON));
190 #endif 192 #endif
191 localized_strings->SetString("enableLogging", 193 localized_strings->SetString("enableLogging",
192 l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_LOGGING)); 194 l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_LOGGING));
193 localized_strings->SetString("improveBrowsingExperience", 195 localized_strings->SetString("improveBrowsingExperience",
194 l10n_util::GetStringUTF16(IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE)); 196 l10n_util::GetStringUTF16(IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE));
195 localized_strings->SetString("disableWebServices", 197 localized_strings->SetString("disableWebServices",
196 l10n_util::GetStringUTF16(IDS_OPTIONS_DISABLE_WEB_SERVICES)); 198 l10n_util::GetStringUTF16(IDS_OPTIONS_DISABLE_WEB_SERVICES));
197 } 199 }
198 200
199 void AdvancedOptionsHandler::Initialize() { 201 void AdvancedOptionsHandler::Initialize() {
(...skipping 12 matching lines...) Expand all
212 if (cloud_print_proxy_ui_enabled_) { 214 if (cloud_print_proxy_ui_enabled_) {
213 SetupCloudPrintProxySection(); 215 SetupCloudPrintProxySection();
214 RefreshCloudPrintStatusFromService(); 216 RefreshCloudPrintStatusFromService();
215 } else { 217 } else {
216 RemoveCloudPrintProxySection(); 218 RemoveCloudPrintProxySection();
217 } 219 }
218 #endif 220 #endif
219 #if defined(ENABLE_REMOTING) && !defined(OS_CHROMEOS) 221 #if defined(ENABLE_REMOTING) && !defined(OS_CHROMEOS)
220 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableRemoting)) { 222 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableRemoting)) {
221 RemoveRemotingSection(); 223 RemoveRemotingSection();
224 } else {
225 remoting_options_handler_.Init(dom_ui_);
222 } 226 }
223 #endif 227 #endif
224 228
225 banner_handler_.reset( 229 banner_handler_.reset(
226 new OptionsManagedBannerHandler(dom_ui_, 230 new OptionsManagedBannerHandler(dom_ui_,
227 ASCIIToUTF16("AdvancedOptions"), 231 ASCIIToUTF16("AdvancedOptions"),
228 OPTIONS_PAGE_ADVANCED)); 232 OPTIONS_PAGE_ADVANCED));
229 } 233 }
230 234
231 DOMMessageHandler* AdvancedOptionsHandler::Attach(DOMUI* dom_ui) { 235 DOMMessageHandler* AdvancedOptionsHandler::Attach(DOMUI* dom_ui) {
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 FundamentalValue useSSL3Value(useSSL3Setting); 639 FundamentalValue useSSL3Value(useSSL3Setting);
636 dom_ui_->CallJavascriptFunction( 640 dom_ui_->CallJavascriptFunction(
637 L"options.AdvancedOptions.SetUseSSL3CheckboxState", 641 L"options.AdvancedOptions.SetUseSSL3CheckboxState",
638 useSSL3Value, disabledValue); 642 useSSL3Value, disabledValue);
639 FundamentalValue useTLS1Value(useTLS1Setting); 643 FundamentalValue useTLS1Value(useTLS1Setting);
640 dom_ui_->CallJavascriptFunction( 644 dom_ui_->CallJavascriptFunction(
641 L"options.AdvancedOptions.SetUseTLS1CheckboxState", 645 L"options.AdvancedOptions.SetUseTLS1CheckboxState",
642 useTLS1Value, disabledValue); 646 useTLS1Value, disabledValue);
643 } 647 }
644 #endif 648 #endif
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options/advanced_options_handler.h ('k') | chrome/browser/remoting/remoting_options_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698