chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm - Issue 6854035: Move blocked content from TabContents to TabContentsWrapper.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 6854035: Move blocked content from TabContents to TabContentsWrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: put back user_gesture Created 9 years, 8 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/ui/blocked_content/blocked_content_tab_helper.cc ('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) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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"

11 #include "chrome/browser/blocked_content_container.h"

12 #include "chrome/browser/content_setting_bubble_model.h"

13 #include "chrome/browser/content_settings/host_content_settings_map.h"	11 #include "chrome/browser/content_settings/host_content_settings_map.h"

14 #include "chrome/browser/plugin_updater.h"	12 #include "chrome/browser/plugin_updater.h"

	13 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"

15 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"	14 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"

16 #import "chrome/browser/ui/cocoa/info_bubble_view.h"	15 #import "chrome/browser/ui/cocoa/info_bubble_view.h"

17 #import "chrome/browser/ui/cocoa/l10n_util.h"	16 #import "chrome/browser/ui/cocoa/l10n_util.h"

18 #include "grit/generated_resources.h"	17 #include "grit/generated_resources.h"

19 #include "skia/ext/skia_utils_mac.h"	18 #include "skia/ext/skia_utils_mac.h"

20 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"	19 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"

21 #include "ui/base/l10n/l10n_util.h"	20 #include "ui/base/l10n/l10n_util.h"

22 #include "webkit/glue/plugins/plugin_list.h"	21 #include "webkit/glue/plugins/plugin_list.h"

23	22

24 namespace {	23 namespace {

(...skipping 455 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
480	479

481 - (IBAction)manageBlocking:(id)sender {	480 - (IBAction)manageBlocking:(id)sender {

482 contentSettingBubbleModel_->OnManageLinkClicked();	481 contentSettingBubbleModel_->OnManageLinkClicked();

483 }	482 }

484	483

485 - (IBAction)closeBubble:(id)sender {	484 - (IBAction)closeBubble:(id)sender {

486 [self close];	485 [self close];

487 }	486 }

488	487

489 @end // ContentSettingBubbleController	488 @end // ContentSettingBubbleController

OLD	NEW