diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-06 18:33:40 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-06 18:33:40 +0000 |
| commit | 4b9d8c0f0154f47a4d09c4b3d976aa49719e71a4 (patch) | |
| tree | 573d2c21dceb2b2ead60c2b3963924f3d36d4a3e /chrome/browser/views/options/simple_content_exceptions_view.h | |
| parent | d909382538a31eda85fb2ec1339fb5fd7276ed90 (diff) | |
| download | chromium_src-4b9d8c0f0154f47a4d09c4b3d976aa49719e71a4.zip chromium_src-4b9d8c0f0154f47a4d09c4b3d976aa49719e71a4.tar.gz chromium_src-4b9d8c0f0154f47a4d09c4b3d976aa49719e71a4.tar.bz2 | |
Add Notifications pane to content settings.
THIS CHANGES THE BEHAVIOR OF HOW PERMISSIONS WORK:
Previosly an infobar was shown every time an application requested notification permissions.
Now, this is shown only the first time an application requests permissions, and the choice is remembered thereafter. If the kDesktopNotificationDefaultContentSetting preference is set, no infobar is shown at all.
This CL also adds content settings UI to manage the exceptions list on mac, win, and linux.
xib changes: Add a new pane to the content settings tab view, with the right title, radio box strings, actions, and bindings.
BUG=45547
TEST=Go to a site that shows notifications. It should only ask for permissions once, and remember the user choice after that. Content Settings->Notifications->Exceptions should show the exceptions list. The content settings pane should be fully functional, and the radio button options ("don't ask") should have an effect on pages that weren't visited before.
Review URL: http://codereview.chromium.org/2825028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51673 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options/simple_content_exceptions_view.h')
| -rw-r--r-- | chrome/browser/views/options/simple_content_exceptions_view.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/views/options/simple_content_exceptions_view.h b/chrome/browser/views/options/simple_content_exceptions_view.h index 2762740..5124532 100644 --- a/chrome/browser/views/options/simple_content_exceptions_view.h +++ b/chrome/browser/views/options/simple_content_exceptions_view.h @@ -30,7 +30,8 @@ class SimpleContentExceptionsView : public views::View, public: // Shows the Exceptions window. Takes ownership of |model|. static void ShowExceptionsWindow(gfx::NativeWindow parent, - RemoveRowsTableModel* model); + RemoveRowsTableModel* model, + int title_message_id); virtual ~SimpleContentExceptionsView(); @@ -58,7 +59,8 @@ class SimpleContentExceptionsView : public views::View, private: // Takes ownership of |model|. - explicit SimpleContentExceptionsView(RemoveRowsTableModel* model); + explicit SimpleContentExceptionsView(RemoveRowsTableModel* model, + int title_message_id); void Init(); @@ -82,6 +84,9 @@ class SimpleContentExceptionsView : public views::View, views::NativeButton* remove_button_; views::NativeButton* remove_all_button_; + // The message id of the window title. + int title_message_id_; + DISALLOW_COPY_AND_ASSIGN(SimpleContentExceptionsView); }; |