summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/gtk_tree.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 06:30:10 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 06:30:10 +0000
commit8a7011c64402ddef52eb312ff0ffa58898f56c8e (patch)
tree7896aeb709624cb4838d5a0d3ff25fafebc3a548 /chrome/browser/gtk/gtk_tree.cc
parente109361f0263a4483e01da73a6299adae689842c (diff)
downloadchromium_src-8a7011c64402ddef52eb312ff0ffa58898f56c8e.zip
chromium_src-8a7011c64402ddef52eb312ff0ffa58898f56c8e.tar.gz
chromium_src-8a7011c64402ddef52eb312ff0ffa58898f56c8e.tar.bz2
[Gtk] Display the current content setting applying to a domain along with the domain.
This patch only affectes the gtk ui. Here is what it looks like: http://imgur.com/g6Gox If third party cookies are blocked, a warning is shown. Next to each domain, the content setting is displayed that applies (or nothing if the default applies). When the user selects some domains and presses an button, the labels are updated accordingly. BUG=49826 TEST=unit_tests Review URL: http://codereview.chromium.org/3096001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/gtk_tree.cc')
-rw-r--r--chrome/browser/gtk/gtk_tree.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/gtk_tree.cc b/chrome/browser/gtk/gtk_tree.cc
index eeb4511..303df11 100644
--- a/chrome/browser/gtk/gtk_tree.cc
+++ b/chrome/browser/gtk/gtk_tree.cc
@@ -158,8 +158,8 @@ void TableAdapter::OnItemsRemoved(int start, int length) {
// TreeAdapter
TreeAdapter::TreeAdapter(Delegate* delegate, TreeModel* tree_model)
- : delegate_(delegate),
- tree_model_(tree_model) {
+ : tree_model_(tree_model),
+ delegate_(delegate) {
tree_store_ = gtk_tree_store_new(COL_COUNT,
GDK_TYPE_PIXBUF,
G_TYPE_STRING,