diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 07:09:30 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 07:09:30 +0000 |
| commit | 2891839ea6e7748abba4c7b822b68342dc84cec2 (patch) | |
| tree | 319dd7e421e3707cb8196a14a0ad17ec1df1d3ac /chrome/browser/views/options | |
| parent | 2e3b520ff4318342b027ea8aa303e5981ea9ce79 (diff) | |
| download | chromium_src-2891839ea6e7748abba4c7b822b68342dc84cec2.zip chromium_src-2891839ea6e7748abba4c7b822b68342dc84cec2.tar.gz chromium_src-2891839ea6e7748abba4c7b822b68342dc84cec2.tar.bz2 | |
This change adds shield icons to the buttons that need elevation to fix Issue 29631. This change adds a bool flag |need_elevation_| to notify when a button needs elevation to the NativeButton class and add shield icons to the following buttons.
- on the "Start Chromium" button on the first-run dialog when the "Make Chromium the default browser" checkbox is enabled.
- on the "Set as Default" button on the default browser infobar.
- on the "Make Google Chrome my default browser" button on the Basics tab of options.
BUG=29631
TEST=Launch Chrome when it is not set as a default browser and see the "Set as Default" button has a shield icon.
TEST=Launch Chrome when it is not set as a default browser and open the "Options" dialog, and see its "Make Google Chrome my default browser" button has a shield icon.
TEST=Launch Chrome with a '--first-run' option when it is not set as a default browser, and see its "Launch Chrome" button has a shield icon.
Review URL: http://codereview.chromium.org/661165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options')
| -rw-r--r-- | chrome/browser/views/options/general_page_view.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index c1519f3..ecd0a1d 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -651,6 +651,7 @@ void GeneralPageView::SetDefaultBrowserUIState( ShellIntegration::DefaultBrowserUIState state) { bool button_enabled = state == ShellIntegration::STATE_NOT_DEFAULT; default_browser_use_as_default_button_->SetEnabled(button_enabled); + default_browser_use_as_default_button_->SetNeedElevation(true); if (state == ShellIntegration::STATE_IS_DEFAULT) { default_browser_status_label_->SetText( l10n_util::GetStringF(IDS_OPTIONS_DEFAULTBROWSER_DEFAULT, |