Introduces 'context' param to NotifierSettingsView.

chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/ash/balloon_collection_impl_ash.h"
 
 #include "ash/shell.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/views/ash/balloon_view_ash.h"
 #include "chrome/browser/ui/views/notifications/balloon_view_host.h"
 #include "chrome/browser/ui/views/notifications/balloon_view_views.h"
 #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;
 
 BalloonCollectionImplAsh::BalloonCollectionImplAsh()
     : settings_view_(NULL) {
   ash::Shell::GetInstance()->GetWebNotificationTray()->message_center()->
       SetDelegate(this);
 }
 
 BalloonCollectionImplAsh::~BalloonCollectionImplAsh() {
@@ skipping 44 matching lines @@
       balloon ? balloon->profile() : ProfileManager::GetDefaultProfile();
   Browser* browser =
       chrome::FindOrCreateTabbedBrowser(profile,
                                         chrome::HOST_DESKTOP_TYPE_ASH);
   if (GetBalloonExtension(balloon))
     chrome::ShowExtensions(browser);
   else
     chrome::ShowContentSettings(browser, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
+void BalloonCollectionImplAsh::ShowSettingsDialog(gfx::NativeView context) {
+  if (settings_view_) {
+    settings_view_->GetWidget()->StackAtTop();
+  } else {

[miket_OOO, 2013/01/25 00:32:10]

No braces, don't really care.

[Jun Mukai, 2013/01/25 00:37:50]

hmm, else-clause has two lines (it doesn't fit to one line) so brace is
necessary here.

+    settings_view_ =
+        message_center::NotifierSettingsView::Create(this, context);
+  }
+}
+
 void BalloonCollectionImplAsh::OnClicked(const std::string& notification_id) {
   Balloon* balloon = base().FindBalloonById(notification_id);
   if (!balloon)
     return;
   balloon->OnClick();
 }
 
 void BalloonCollectionImplAsh::OnButtonClicked(
     const std::string& notification_id, int button_index) {
   Balloon* balloon = base().FindBalloonById(notification_id);
@@ skipping 110 matching lines @@
   return extension_service->extensions()->GetExtensionOrAppByURL(
       ExtensionURLInfo(origin));
 }
 
 #if defined(OS_CHROMEOS)
 // static
 BalloonCollection* BalloonCollection::Create() {
   return new BalloonCollectionImplAsh();
 }
 #endif