diff options
| author | mirandac@google.com <mirandac@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 22:53:27 +0000 |
|---|---|---|
| committer | mirandac@google.com <mirandac@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 22:53:27 +0000 |
| commit | 48e9e3d25f9f7fb2a25adfa0ec1b17de98dce99b (patch) | |
| tree | 795f00cadb5a7159c852cfbe9de0b9a45c0d2106 /views | |
| parent | 024f2f060ad0bdab9b0e8008973bde64bf04bd28 (diff) | |
| download | chromium_src-48e9e3d25f9f7fb2a25adfa0ec1b17de98dce99b.zip chromium_src-48e9e3d25f9f7fb2a25adfa0ec1b17de98dce99b.tar.gz chromium_src-48e9e3d25f9f7fb2a25adfa0ec1b17de98dce99b.tar.bz2 | |
Do not show Vista elevation shield if UAC is disabled.
BUG=42571
TEST=disable UAC and run Chrome as first run, with import. check "make chrome your default browser" box. see no shield.
Review URL: http://codereview.chromium.org/1732013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/button/native_button_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/button/native_button_win.cc b/views/controls/button/native_button_win.cc index 57be88c..c485c71 100644 --- a/views/controls/button/native_button_win.cc +++ b/views/controls/button/native_button_win.cc @@ -36,7 +36,8 @@ void NativeButtonWin::UpdateLabel() { // Show or hide the shield icon of Windows onto this button every time when we // update the button text so Windows can lay out the shield icon and the // button text correctly. - if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) { + if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA && + win_util::UserAccountControlIsEnabled()) { Button_SetElevationRequiredState(native_view(), native_button_->need_elevation()); } |