Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: chrome/browser/ui/gtk/collected_cookies_gtk.cc

Issue 11111022: Remove TabContents from constrained windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unrelated gtk code Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/gtk/collected_cookies_gtk.h" 5 #include "chrome/browser/ui/gtk/collected_cookies_gtk.h"
6 6
7 #include <string> 7 #include <string>
8 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" 8 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
9 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" 9 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
10 #include "chrome/browser/browsing_data/browsing_data_database_helper.h" 10 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 gtk_button_set_label(GTK_BUTTON(close_button_), 183 gtk_button_set_label(GTK_BUTTON(close_button_),
184 l10n_util::GetStringUTF8(IDS_CLOSE).c_str()); 184 l10n_util::GetStringUTF8(IDS_CLOSE).c_str());
185 g_signal_connect(close_button_, "clicked", G_CALLBACK(OnCloseThunk), this); 185 g_signal_connect(close_button_, "clicked", G_CALLBACK(OnCloseThunk), this);
186 gtk_box_pack_end(GTK_BOX(button_box), close_button_, FALSE, TRUE, 0); 186 gtk_box_pack_end(GTK_BOX(button_box), close_button_, FALSE, TRUE, 0);
187 187
188 // Show the dialog. 188 // Show the dialog.
189 allowed_cookies_tree_adapter_->Init(); 189 allowed_cookies_tree_adapter_->Init();
190 blocked_cookies_tree_adapter_->Init(); 190 blocked_cookies_tree_adapter_->Init();
191 EnableControls(); 191 EnableControls();
192 ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_))); 192 ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_)));
193 window_ = new ConstrainedWindowGtk(tab_contents_, this); 193 window_ = new ConstrainedWindowGtk(tab_contents_->web_contents(), this);
194 } 194 }
195 195
196 GtkWidget* CollectedCookiesGtk::CreateAllowedPane() { 196 GtkWidget* CollectedCookiesGtk::CreateAllowedPane() {
197 GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing); 197 GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
198 198
199 GtkWidget* label = gtk_label_new( 199 GtkWidget* label = gtk_label_new(
200 l10n_util::GetStringUTF8(IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL). 200 l10n_util::GetStringUTF8(IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL).
201 c_str()); 201 c_str());
202 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 202 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
203 gtk_box_pack_start(GTK_BOX(cookie_list_vbox), label, FALSE, FALSE, 203 gtk_box_pack_start(GTK_BOX(cookie_list_vbox), label, FALSE, FALSE,
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this); 541 tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
542 gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view), path, TRUE); 542 gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view), path, TRUE);
543 g_signal_handlers_unblock_by_func( 543 g_signal_handlers_unblock_by_func(
544 tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this); 544 tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
545 } 545 }
546 546
547 void CollectedCookiesGtk::OnTreeViewSelectionChange(GtkWidget* selection) { 547 void CollectedCookiesGtk::OnTreeViewSelectionChange(GtkWidget* selection) {
548 EnableControls(); 548 EnableControls();
549 ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_))); 549 ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_)));
550 } 550 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698