Focus on collected cookie contrained window when a TabContents gets focus.

- On Linux, use "hierarchy-changed" to set initial focus as other constrained
  dialogs do;
- On ChromeOS, set initial focus as the following:
  FocusManager::RestoreFocusedView (after info bubble dismiss)  ->
  ... ->
  NativeTabContentsContainerGtk::Focus ->
  TabContentsViewGtk::Focus ->
  ConstrainedWindowGtk::FocusConstrainedWindow ->
  ConstrainedWindowGtkDelegate::Focus (overridden by CollectedCookiesGtk)

BUG=chromium:72592
TEST=Verify fix for chromium:72592.

Review URL: http://codereview.chromium.org/6475013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75024 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
index 2c2349e..f76b90c 100644
--- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc
+++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
@@ -249,11 +249,11 @@ void CollectedCookiesGtk::Init() {
   gtk_button_box_set_layout(GTK_BUTTON_BOX(button_box), GTK_BUTTONBOX_END);
   gtk_box_set_spacing(GTK_BOX(button_box), gtk_util::kControlSpacing);
   gtk_box_pack_end(GTK_BOX(dialog_), button_box, FALSE, TRUE, 0);
-  GtkWidget* close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-  gtk_button_set_label(GTK_BUTTON(close),
+  close_button_ = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+  gtk_button_set_label(GTK_BUTTON(close_button_),
                        l10n_util::GetStringUTF8(IDS_CLOSE).c_str());
-  g_signal_connect(close, "clicked", G_CALLBACK(OnCloseThunk), this);
-  gtk_box_pack_end(GTK_BOX(button_box), close, FALSE, TRUE, 0);
+  g_signal_connect(close_button_, "clicked", G_CALLBACK(OnCloseThunk), this);
+  gtk_box_pack_end(GTK_BOX(button_box), close_button_, FALSE, TRUE, 0);
 
   // Show the dialog.
   allowed_cookies_tree_adapter_->Init();
@@ -270,6 +270,10 @@ GtkWidget* CollectedCookiesGtk::GetWidgetRoot() {
   return dialog_;
 }
 
+GtkWidget* CollectedCookiesGtk::GetFocusWidget() {
+  return close_button_;
+}
+
 void CollectedCookiesGtk::DeleteDelegate() {
   delete this;
 }