Skip to content
Snippets Groups Projects
Commit 08aabf3b authored by dilmah@chromium.org's avatar dilmah@chromium.org
Browse files

Hide "Change proxy settings link" during connection in progress.

Replace chrome://options with chrome://settings because it was changed recently.

BUG=None
TEST=Manual

Review URL: http://codereview.chromium.org/3397028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60466 0039d316-1c4b-4281-b951-d872f2087c98
parent e14fff7f
No related branches found
No related tags found
No related merge requests found
......@@ -360,6 +360,7 @@ void NetworkSelectionView::ShowConnectingStatus(bool connecting,
select_network_label_->SetVisible(!connecting);
network_dropdown_->SetVisible(!connecting);
continue_button_->SetVisible(!connecting);
proxy_settings_link_->SetVisible(!connecting);
connecting_network_label_->SetVisible(connecting);
InitLayout();
Layout();
......@@ -390,7 +391,7 @@ bool NetworkSelectionView::IsContinueEnabled() const {
void NetworkSelectionView::LinkActivated(views::Link* source, int) {
if (source == proxy_settings_link_) {
if (!proxy_settings_dialog_.get()) {
static const char kProxySettingsURL[] = "chrome://options/proxy";
static const char kProxySettingsURL[] = "chrome://settings/proxy";
proxy_settings_dialog_.reset(new LoginHtmlDialog(
this,
GetNativeWindow(),
......
......@@ -167,7 +167,7 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {
OptionsUIHTMLSource* html_source =
new OptionsUIHTMLSource(localized_strings);
// Set up the chrome://options/ source.
// Set up the chrome://settings/ source.
ChromeThread::PostTask(
ChromeThread::IO, FROM_HERE,
NewRunnableMethod(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment