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

Unified Diff: chrome/browser/notifications/notification_options_menu_model.cc

Issue 6670011: Options: Remove the GTK and Views native options code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 9 years, 9 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/notifications/notification_options_menu_model.cc
diff --git a/chrome/browser/notifications/notification_options_menu_model.cc b/chrome/browser/notifications/notification_options_menu_model.cc
index c5246439247159624a16cc0b7b005c7726320e6b..b04b5a95b91404251cb5aa7167c526d0431894a1 100644
--- a/chrome/browser/notifications/notification_options_menu_model.cc
+++ b/chrome/browser/notifications/notification_options_menu_model.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/notifications/balloon_collection.h"
+#include "chrome/browser/notifications/balloon_host.h"
#include "chrome/browser/notifications/desktop_notification_service.h"
#include "chrome/browser/notifications/notification.h"
#include "chrome/browser/notifications/notification_ui_manager.h"
@@ -20,13 +21,10 @@
#include "chrome/common/content_settings_types.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/url_constants.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
-#if defined(OS_WIN)
-#include "chrome/browser/ui/views/browser_dialogs.h"
-#endif // OS_WIN
-
// Menu commands
const int kTogglePermissionCommand = 0;
const int kToggleExtensionCommand = 1;
@@ -154,8 +152,8 @@ bool NotificationOptionsMenuModel::IsItemForCommandIdDynamic(int command_id)
string16 NotificationOptionsMenuModel::GetLabelForCommandId(int command_id)
const {
- // TODO(tfarina,johnnyg): Removed this code if we decide to close
- // notifications after permissions are revoked.
+ // TODO(tfarina,johnnyg): Remove this code if we decide to close notifications
+ // after permissions are revoked.
if (command_id == kTogglePermissionCommand ||
command_id == kToggleExtensionCommand) {
const Notification& notification = balloon_->notification();
@@ -236,21 +234,10 @@ void NotificationOptionsMenuModel::ExecuteCommand(int command_id) {
break;
}
case kOpenContentSettingsCommand: {
- Browser* browser = BrowserList::GetLastActive();
- if (browser) {
- static_cast<TabContentsDelegate*>(browser)->ShowContentSettingsWindow(
- CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
- } else {
-#if defined(OS_WIN)
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kChromeFrame)) {
- // We may not have a browser if this is a chrome frame process.
- browser::ShowContentSettingsWindow(NULL,
- CONTENT_SETTINGS_TYPE_DEFAULT,
- balloon_->profile());
- }
-#endif // OS_WIN
- }
+ TabContents* tab_contents =
+ balloon_->view()->GetHost()->associated_tab_contents();
+ tab_contents->delegate()->ShowContentSettingsPage(
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
break;
}
default:
« no previous file with comments | « chrome/browser/content_setting_bubble_model.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698