chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm - Issue 10826164: Add infobar for PPAPI broker usage.

Side by Side Diff: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

Issue 10826164: Add infobar for PPAPI broker usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix merge Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/resources/options2/content_settings.html ('K') | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h "	5 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h "

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/sys_string_conversions.h"	9 #include "base/sys_string_conversions.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

(...skipping 115 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
126 case CONTENT_SETTINGS_TYPE_PLUGINS:	126 case CONTENT_SETTINGS_TYPE_PLUGINS:

127 nibPath = @"ContentBlockedPlugins"; break;	127 nibPath = @"ContentBlockedPlugins"; break;

128 case CONTENT_SETTINGS_TYPE_POPUPS:	128 case CONTENT_SETTINGS_TYPE_POPUPS:

129 nibPath = @"ContentBlockedPopups"; break;	129 nibPath = @"ContentBlockedPopups"; break;

130 case CONTENT_SETTINGS_TYPE_GEOLOCATION:	130 case CONTENT_SETTINGS_TYPE_GEOLOCATION:

131 nibPath = @"ContentBlockedGeolocation"; break;	131 nibPath = @"ContentBlockedGeolocation"; break;

132 case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:	132 case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:

133 nibPath = @"ContentBlockedMixedScript"; break;	133 nibPath = @"ContentBlockedMixedScript"; break;

134 case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:	134 case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:

135 nibPath = @"ContentProtocolHandlers"; break;	135 nibPath = @"ContentProtocolHandlers"; break;

136 default:	136 // These content types have no bubble:

	137 case CONTENT_SETTINGS_TYPE_DEFAULT:

	138 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:

	139 case CONTENT_SETTINGS_TYPE_INTENTS:

	140 case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE:

	141 case CONTENT_SETTINGS_TYPE_FULLSCREEN:

	142 case CONTENT_SETTINGS_TYPE_MOUSELOCK:

	143 case CONTENT_SETTINGS_TYPE_MEDIASTREAM:

	144 case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:

	145 case CONTENT_SETTINGS_NUM_TYPES:

137 NOTREACHED();	146 NOTREACHED();

138 }	147 }

139 if ((self = [super initWithWindowNibPath:nibPath	148 if ((self = [super initWithWindowNibPath:nibPath

140 parentWindow:parentWindow	149 parentWindow:parentWindow

141 anchoredAt:anchoredAt])) {	150 anchoredAt:anchoredAt])) {

142 contentSettingBubbleModel_.reset(model.release());	151 contentSettingBubbleModel_.reset(model.release());

143 [self showWindow:nil];	152 [self showWindow:nil];

144 }	153 }

145 return self;	154 return self;

146 }	155 }

(...skipping 337 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
484 - (IBAction)manageBlocking:(id)sender {	493 - (IBAction)manageBlocking:(id)sender {

485 contentSettingBubbleModel_->OnManageLinkClicked();	494 contentSettingBubbleModel_->OnManageLinkClicked();

486 }	495 }

487	496

488 - (IBAction)closeBubble:(id)sender {	497 - (IBAction)closeBubble:(id)sender {

489 contentSettingBubbleModel_->OnDoneClicked();	498 contentSettingBubbleModel_->OnDoneClicked();

490 [self close];	499 [self close];

491 }	500 }

492	501

493 @end // ContentSettingBubbleController	502 @end // ContentSettingBubbleController

OLD	NEW