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

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

Unified 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 side-by-side diff with in-line comments

Download patch

« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

index 9624dd1dd02dbb02afb0995e884c3a98867942ff..9587ea9a329a1969f1e1d6e8e09b9b48f0e46aec 100644

--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

@@ -1,4 +1,4 @@

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

// found in the LICENSE file.

@@ -8,10 +8,9 @@

#include "base/logging.h"

#include "base/sys_string_conversions.h"

#include "base/utf_string_conversions.h"

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

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

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

#include "chrome/browser/plugin_updater.h"

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

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

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

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