summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-06 08:48:23 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-06 08:48:23 +0000
commitf8f69210d233566fddf71b57b093dd16da609ffc (patch)
tree9ed9ffcd865d65c11b11f73ea486efa79af13346 /chrome/browser/cocoa
parent0af29d8cedd97d4604619dd4ab2b5e0a0805ecb1 (diff)
downloadchromium_src-f8f69210d233566fddf71b57b093dd16da609ffc.zip
chromium_src-f8f69210d233566fddf71b57b093dd16da609ffc.tar.gz
chromium_src-f8f69210d233566fddf71b57b093dd16da609ffc.tar.bz2
Display an info link in the blocked cookies info bubble.
The link will pop up a dialog that displays the cookies blocked and accessed by the current page. The XIB change adds a link-styled button (cell type HyperlinkButtonCell) below the title and above the horizontal line on the bubble with the text IDS_BLOCKED_COOKIES_INFO. The button action is hooked up to showMoreInfo: in the File's Owner. BUG=45230 TEST=none Review URL: http://codereview.chromium.org/2799012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/content_blocked_bubble_controller.h3
-rw-r--r--chrome/browser/cocoa/content_blocked_bubble_controller.mm5
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller.h b/chrome/browser/cocoa/content_blocked_bubble_controller.h
index 6bb7c90..3d824cf 100644
--- a/chrome/browser/cocoa/content_blocked_bubble_controller.h
+++ b/chrome/browser/cocoa/content_blocked_bubble_controller.h
@@ -53,4 +53,7 @@ typedef std::map<NSButton*, int> PopupLinks;
// Callback for "manage" button.
- (IBAction)manageBlocking:(id)sender;
+// Callback for "info" link.
+- (IBAction)showMoreInfo:(id)sender;
+
@end
diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller.mm b/chrome/browser/cocoa/content_blocked_bubble_controller.mm
index d0ae86f..b4c453b 100644
--- a/chrome/browser/cocoa/content_blocked_bubble_controller.mm
+++ b/chrome/browser/cocoa/content_blocked_bubble_controller.mm
@@ -393,6 +393,11 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) {
contentSettingBubbleModel_->OnManageLinkClicked();
}
+- (IBAction)showMoreInfo:(id)sender {
+ contentSettingBubbleModel_->OnInfoLinkClicked();
+ [self close];
+}
+
- (void)popupLinkClicked:(id)sender {
content_blocked_bubble::PopupLinks::iterator i(popupLinks_.find(sender));
DCHECK(i != popupLinks_.end());