More Gtk Cookies View polish.

chrome/browser/gtk/options/cookies_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/options/cookies_view.h"
 
 #include <set>
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/gfx/gtk_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/time_format.h"
 #include "chrome/browser/cookies_table_model.h"
 #include "chrome/common/gtk_util.h"
 #include "grit/generated_resources.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace {
 
 // Initial size for dialog.
 const int kDialogDefaultWidth = 550;
 const int kDialogDefaultHeight = 550;
 const int kSiteColumnInitialSize = 300;
 
 // Delay after entering filter text before filtering occurs.
-const int kSearchFilterDelayMs = 500;
+const int kSearchFilterDelayMs = 100;
 
 // Response ids for our custom buttons.
 enum {
   RESPONSE_REMOVE = 1,
   RESPONSE_REMOVE_ALL
 };
 
 // The currently open cookie manager, if any.
 CookiesView* instance_ = NULL;
 
@@ skipping 40 matching lines @@
 void CookiesView::Init() {
   dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_COOKIES_WINDOW_TITLE).c_str(),
       NULL,
       GTK_DIALOG_NO_SEPARATOR,
       GTK_STOCK_CLOSE,
       GTK_RESPONSE_CLOSE,
       NULL);
   gtk_util::SetWindowIcon(GTK_WINDOW(dialog_));
 
-  remove_button_ = gtk_dialog_add_button(
-      GTK_DIALOG(dialog_),
+  remove_button_ = gtk_util::AddButtonToDialog(
+      dialog_,
       gtk_util::ConvertAcceleratorsFromWindowsStyle(
         l10n_util::GetStringUTF8(IDS_COOKIES_REMOVE_LABEL)).c_str(),
+      GTK_STOCK_REMOVE,
       RESPONSE_REMOVE);
   gtk_button_box_set_child_secondary(
       GTK_BUTTON_BOX(GTK_DIALOG(dialog_)->action_area),
       remove_button_,
       TRUE);
 
-  remove_all_button_ = gtk_dialog_add_button(
-      GTK_DIALOG(dialog_),
+  remove_all_button_ = gtk_util::AddButtonToDialog(
+      dialog_,
       gtk_util::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(IDS_COOKIES_REMOVE_ALL_LABEL)).c_str(),
+      GTK_STOCK_CLEAR,
       RESPONSE_REMOVE_ALL);
   gtk_button_box_set_child_secondary(
       GTK_BUTTON_BOX(GTK_DIALOG(dialog_)->action_area),
       remove_all_button_,
       TRUE);
 
   gtk_dialog_set_default_response(GTK_DIALOG(dialog_), GTK_RESPONSE_CLOSE);
   gtk_window_set_default_size(GTK_WINDOW(dialog_), kDialogDefaultWidth,
                               kDialogDefaultHeight);
   gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
@@ skipping 37 matching lines @@
 
   GtkWidget* scroll_window = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window),
                                  GTK_POLICY_AUTOMATIC,
                                  GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window),
                                       GTK_SHADOW_ETCHED_IN);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), scroll_window, TRUE, TRUE, 0);
 
   list_store_ = gtk_list_store_new(COL_COUNT,
-                                   GDK_TYPE_PIXBUF,
                                    G_TYPE_STRING,
                                    G_TYPE_STRING);
   list_sort_ = gtk_tree_model_sort_new_with_model(GTK_TREE_MODEL(list_store_));
   gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(list_sort_),
                                   COL_SITE, CompareSite, this, NULL);
   gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(list_sort_),
                                   COL_COOKIE_NAME, CompareCookieName, this,
                                   NULL);
   gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(list_sort_),
                                        COL_SITE, GTK_SORT_ASCENDING);
   tree_ = gtk_tree_view_new_with_model(GTK_TREE_MODEL(list_sort_));
   gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree_), TRUE);
   gtk_container_add(GTK_CONTAINER(scroll_window), tree_);
 
   GtkTreeViewColumn* site_column = gtk_tree_view_column_new();
-  GtkCellRenderer* pixbuf_renderer = gtk_cell_renderer_pixbuf_new();
-  gtk_tree_view_column_pack_start(site_column, pixbuf_renderer, FALSE);
-  gtk_tree_view_column_add_attribute(site_column, pixbuf_renderer, "pixbuf",
-                                     COL_ICON);
   GtkCellRenderer* site_renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_column_pack_start(site_column, site_renderer, TRUE);
   gtk_tree_view_column_add_attribute(site_column, site_renderer, "text",
                                      COL_SITE);
   gtk_tree_view_column_set_title(
       site_column, l10n_util::GetStringUTF8(
           IDS_COOKIES_DOMAIN_COLUMN_HEADER).c_str());
   gtk_tree_view_column_set_sort_column_id(site_column, COL_SITE);
   gtk_tree_view_column_set_sizing(site_column, GTK_TREE_VIEW_COLUMN_FIXED);
   gtk_tree_view_column_set_resizable(site_column, TRUE);
@@ skipping 173 matching lines @@
        selected != selected_rows.rend(); ++selected) {
     cookies_table_model_->RemoveCookies(*selected, 1);
   }
 }
 
 void CookiesView::OnAnyModelUpdate() {
   EnableControls();
 }
 
 void CookiesView::SetColumnValues(int row, GtkTreeIter* iter) {
-  SkBitmap bitmap = cookies_table_model_->GetIcon(row);
-  GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
   std::wstring site = cookies_table_model_->GetText(
       row, IDS_COOKIES_DOMAIN_COLUMN_HEADER);
   std::wstring name = cookies_table_model_->GetText(
       row, IDS_COOKIES_NAME_COLUMN_HEADER);
   gtk_list_store_set(list_store_, iter,
-                     COL_ICON, pixbuf,
                      COL_SITE, WideToUTF8(site).c_str(),
                      COL_COOKIE_NAME, WideToUTF8(name).c_str(),
                      -1);
-  g_object_unref(pixbuf);
 }
 
 // Compare the value of the given column at the given rows.
 gint CookiesView::CompareRows(GtkTreeModel* model, GtkTreeIter* a,
                               GtkTreeIter* b, int column_id) {
   int row1 = gtk_tree::GetRowNumForIter(model, a);
   int row2 = gtk_tree::GetRowNumForIter(model, b);
   return cookies_table_model_->CompareValues(row1, row2, column_id);
 }
 
@@ skipping 57 matching lines @@
   window->EnableControls();
 }
 
 // static
 void CookiesView::OnFilterClearButtonClicked(GtkButton* button,
                                              CookiesView* window) {
   gtk_entry_set_text(GTK_ENTRY(window->filter_entry_), "");
   window->filter_update_factory_.RevokeAll();
   window->UpdateFilterResults();
 }