chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm - Issue 9703099: Revert 126959 - Re-factor location bar/toolbar code to get rid of the browser dependency. This CL i…

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/location_bar/content_setting_decoration.mm

Issue 9703099: Revert 126959 - Re-factor location bar/toolbar code to get rid of the browser dependency. This CL i… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 9 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

« no previous file with comments | « chrome/browser/ui/browser_toolbar_model_delegate.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

===================================================================

--- chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm (revision 127082)

+++ chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm (working copy)

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

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

// found in the LICENSE file.

@@ -11,7 +11,6 @@

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

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

-#include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"

#include "chrome/browser/ui/browser_list.h"

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

#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

@@ -279,8 +278,7 @@

// Open bubble.

ContentSettingBubbleModel* model =

ContentSettingBubbleModel::CreateContentSettingBubbleModel(

- browser->content_setting_bubble_model_delegate(),

- tabContents, profile_,

+ browser, tabContents, profile_,

content_setting_image_model_->get_content_settings_type());

[ContentSettingBubbleController showForModel:model

parentWindow:[field window]