diff options
| author | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 14:37:21 +0000 |
|---|---|---|
| committer | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 14:37:21 +0000 |
| commit | 08aabf3b71843b01ae31eba672f5c1971b0f7747 (patch) | |
| tree | cd6b57c57f6426810b5732a391ce09a7b9154d61 /chrome/browser | |
| parent | e14fff7f803688dea1aea0c96fae7fe1c507dd4d (diff) | |
| download | chromium_src-08aabf3b71843b01ae31eba672f5c1971b0f7747.zip chromium_src-08aabf3b71843b01ae31eba672f5c1971b0f7747.tar.gz chromium_src-08aabf3b71843b01ae31eba672f5c1971b0f7747.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chromeos/login/network_selection_view.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/options_ui.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/login/network_selection_view.cc b/chrome/browser/chromeos/login/network_selection_view.cc index e084246..6298e04 100644 --- a/chrome/browser/chromeos/login/network_selection_view.cc +++ b/chrome/browser/chromeos/login/network_selection_view.cc @@ -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(), diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc index 15a7ed8..cb7830a 100644 --- a/chrome/browser/dom_ui/options_ui.cc +++ b/chrome/browser/dom_ui/options_ui.cc @@ -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( |