chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc - Issue 10887027: (GTK only) Replace checkboxes with menus and add support for managed settings.

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/website_settings/website_settings_popup_gtk.cc

Issue 10887027: (GTK only) Replace checkboxes with menus and add support for managed settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix clang build 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/gtk/website_settings/permission_selector.cc ('k') | chrome/browser/ui/website_settings/permission_menu_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc

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

index fc33a016a4a7d28de67c85902f915a37105edda3..cefb4a817d1ba378a95e5fe943cddbde09323cca 100644

--- a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc

+++ b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc

@@ -342,8 +342,8 @@ void WebsiteSettingsPopupGtk::InitContents() {

void WebsiteSettingsPopupGtk::OnPermissionChanged(

PermissionSelector* selector) {

- presenter_->OnSitePermissionChanged(selector->type(),

- selector->setting());

+ presenter_->OnSitePermissionChanged(selector->GetType(),

+ selector->GetSetting());

}

void WebsiteSettingsPopupGtk::OnComboboxShown() {

@@ -535,9 +535,10 @@ void WebsiteSettingsPopupGtk::SetPermissionInfo(

theme_service_,

permission->type,

permission->setting,

- permission->default_setting);

+ permission->default_setting,

+ permission->source);

selector->AddObserver(this);

- GtkWidget* hbox = selector->CreateUI();

+ GtkWidget* hbox = selector->widget();

selectors_.push_back(selector);

gtk_box_pack_start(GTK_BOX(permissions_section_contents_), hbox, FALSE,

FALSE, 0);