summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 17:14:02 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 17:14:02 +0000
commitd40165b970419792453592cc0f8f45b5a57d75c5 (patch)
treea35f7c77fe9dcd3e3065bffdf05e60c049a913d6 /chrome/browser
parentc8f6e4a7e4f5c9cebccdeeefcd22fe947449215f (diff)
downloadchromium_src-d40165b970419792453592cc0f8f45b5a57d75c5.zip
chromium_src-d40165b970419792453592cc0f8f45b5a57d75c5.tar.gz
chromium_src-d40165b970419792453592cc0f8f45b5a57d75c5.tar.bz2
Add link to disable individual plug-ins in Plug-ins tab of Content Settings (Mac part).
.xib change: Add hyperlink button with text "^IDS_PLUGIN_SELECTIVE_DISABLE" and hooked up to -openPluginsPage: of file's owner. BUG=736 TEST=Go to Content Settings -> Plug-ins and click on "Disable individual plug-ins..."; should get browser window with chrome://plugins/. Review URL: http://codereview.chromium.org/1285002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42481 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/cocoa/content_settings_dialog_controller.h1
-rw-r--r--chrome/browser/cocoa/content_settings_dialog_controller.mm9
2 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.h b/chrome/browser/cocoa/content_settings_dialog_controller.h
index 246a698..28b1944 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller.h
+++ b/chrome/browser/cocoa/content_settings_dialog_controller.h
@@ -37,6 +37,7 @@ class Profile;
- (IBAction)showCookies:(id)sender;
- (IBAction)openFlashPlayerSettings:(id)sender;
+- (IBAction)openPluginsPage:(id)sender;
- (IBAction)showCookieExceptions:(id)sender;
- (IBAction)showImagesExceptions:(id)sender;
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.mm b/chrome/browser/cocoa/content_settings_dialog_controller.mm
index 2af5616..ef66d7d 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller.mm
+++ b/chrome/browser/cocoa/content_settings_dialog_controller.mm
@@ -17,6 +17,7 @@
#include "chrome/browser/profile.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/pref_names.h"
+#include "chrome/common/url_constants.h"
#include "grit/locale_settings.h"
@@ -229,6 +230,14 @@ class PrefObserverBridge : public NotificationObserver {
browser->window()->Show();
}
+// Called when the user clicks the "Disable individual plug-ins..." button.
+- (IBAction)openPluginsPage:(id)sender {
+ Browser* browser = Browser::Create(profile_);
+ browser->OpenURL(GURL(chrome::kChromeUIPluginsURL),
+ GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+ browser->window()->Show();
+}
+
- (IBAction)showCookieExceptions:(id)sender {
[self showExceptionsForType:CONTENT_SETTINGS_TYPE_COOKIES];
}