chrome/browser/ui/gtk/location_bar_view_gtk.cc - Issue 9479008: Re-factor location bar/toolbar code to get rid of the browser dependency.

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/gtk/location_bar_view_gtk.cc

Issue 9479008: Re-factor location bar/toolbar code to get rid of the browser dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: comments fix 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

« chrome/browser/ui/content_settings/content_setting_bubble_model.h ('K') | « chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_wrapper_container.h » ('j') | chrome/browser/ui/views/reload_button.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc

diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

index 9e8712dd2306385ac171b294f01f41db8f666b43..5ffbded5ba0b02b022ae8940d215f74a775df2bd 100644

--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc

+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

@@ -32,6 +32,7 @@

#include "chrome/browser/search_engines/template_url_service.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

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

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

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

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

#include "chrome/browser/ui/content_settings/content_setting_image_model.h"

@@ -1377,7 +1378,9 @@ gboolean LocationBarViewGtk::ContentSettingImageViewGtk::OnButtonPressed(

content_setting_bubble_ = new ContentSettingBubbleGtk(

sender, this,

ContentSettingBubbleModel::CreateContentSettingBubbleModel(

- parent_->browser(), tab_contents, profile,

+ parent_->browser()->content_setting_bubble_model_delegate(),

+ tab_contents,

+ profile,

content_setting_image_model_->get_content_settings_type()),

profile, tab_contents->web_contents());

return TRUE;