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

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

Issue 8897006: GTK: Remove deprecated methods and replace them with the new standard calls. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Oh, that's what the conflict was. Remove double gtk/gtk.h Created 9 years 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
« no previous file with comments | « chrome/browser/ui/gtk/find_bar_gtk.cc ('k') | chrome/browser/ui/gtk/gtk_custom_menu_item.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/gtk_chrome_cookie_view.h" 5 #include "chrome/browser/ui/gtk/gtk_chrome_cookie_view.h"
6 6
7 #include "base/i18n/time_formatting.h" 7 #include "base/i18n/time_formatting.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "grit/generated_resources.h" 9 #include "grit/generated_resources.h"
10 #include "ui/base/gtk/gtk_hig_constants.h" 10 #include "ui/base/gtk/gtk_hig_constants.h"
(...skipping 26 matching lines...) Expand all
37 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); 37 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
38 38
39 return name_label; 39 return name_label;
40 } 40 }
41 41
42 GtkWidget* InitDetailRow(int row, int label_id, 42 GtkWidget* InitDetailRow(int row, int label_id,
43 GtkWidget* details_table, GtkWidget** entry) { 43 GtkWidget* details_table, GtkWidget** entry) {
44 GtkWidget* name_label = InitRowLabel(row, label_id, details_table); 44 GtkWidget* name_label = InitRowLabel(row, label_id, details_table);
45 45
46 *entry = gtk_entry_new(); 46 *entry = gtk_entry_new();
47 gtk_entry_set_editable(GTK_ENTRY(*entry), FALSE); 47 gtk_editable_set_editable(GTK_EDITABLE(*entry), FALSE);
48 gtk_entry_set_has_frame(GTK_ENTRY(*entry), FALSE); 48 gtk_entry_set_has_frame(GTK_ENTRY(*entry), FALSE);
49 gtk_table_attach_defaults(GTK_TABLE(details_table), *entry, 49 gtk_table_attach_defaults(GTK_TABLE(details_table), *entry,
50 1, 2, row, row + 1); 50 1, 2, row, row + 1);
51 51
52 return name_label; 52 return name_label;
53 } 53 }
54 54
55 GtkWidget* InitComboboxRow(int row, int label_id, 55 GtkWidget* InitComboboxRow(int row, int label_id,
56 GtkWidget* details_table, 56 GtkWidget* details_table,
57 GtkWidget** combobox, 57 GtkWidget** combobox,
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 int store_size = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL); 654 int store_size = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
655 if (store_size == 1) 655 if (store_size == 1)
656 return false; 656 return false;
657 657
658 DCHECK_EQ(2, store_size); 658 DCHECK_EQ(2, store_size);
659 659
660 int selected = gtk_combo_box_get_active(GTK_COMBO_BOX( 660 int selected = gtk_combo_box_get_active(GTK_COMBO_BOX(
661 self->cookie_expires_combobox_)); 661 self->cookie_expires_combobox_));
662 return selected == 1; 662 return selected == 1;
663 } 663 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/find_bar_gtk.cc ('k') | chrome/browser/ui/gtk/gtk_custom_menu_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698