Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Unified Diff: chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc

Issue 12052057: Introduces 'context' param to NotifierSettingsView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a compile error happened by a latest CL Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc
diff --git a/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc b/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc
index 104549003796cee8f469f31bbd11ec5b3a98bb53..8d0e37d7be770b9160cfc8aeb7a9fd49b65789f9 100644
--- a/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc
+++ b/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc
@@ -21,6 +21,7 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_set.h"
#include "chrome/common/extensions/permissions/api_permission.h"
+#include "ui/views/widget/widget.h"
using message_center::NotifierSettingsView;
@@ -85,6 +86,15 @@ void BalloonCollectionImplAsh::ShowSettings(
chrome::ShowContentSettings(browser, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
}
+void BalloonCollectionImplAsh::ShowSettingsDialog(gfx::NativeView context) {
+ if (settings_view_) {
+ settings_view_->GetWidget()->StackAtTop();
+ } else {
+ settings_view_ =
+ message_center::NotifierSettingsView::Create(this, context);
+ }
+}
+
void BalloonCollectionImplAsh::OnClicked(const std::string& notification_id) {
Balloon* balloon = base().FindBalloonById(notification_id);
if (!balloon)

Powered by Google App Engine
This is Rietveld 408576698