Integrate ChromeToMobile with GTK Action Box.

chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.cc

 // Copyright (c) 2012 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/ui/gtk/chrome_to_mobile_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 
@@ skipping 35 matching lines @@
 
 // The seconds to delay before automatically closing the bubble after sending.
 const int kAutoCloseDelay = 3;
 
 // The color of the error label.
 const GdkColor kErrorColor = GDK_COLOR_RGB(0xFF, 0x00, 0x00);
 
 }  // namespace
 
 // static
-void ChromeToMobileBubbleGtk::Show(GtkImage* anchor_image, Browser* browser) {
+void ChromeToMobileBubbleGtk::Show(GtkWidget* anchor_widget, Browser* browser) {
   // Do not construct a new bubble if one is already being shown.
   if (!g_bubble)
-    g_bubble = new ChromeToMobileBubbleGtk(anchor_image, browser);
+    g_bubble = new ChromeToMobileBubbleGtk(anchor_widget, browser);
 }
 
 void ChromeToMobileBubbleGtk::BubbleClosing(BubbleGtk* bubble,
                                             bool closed_by_escape) {
   DCHECK_EQ(bubble, bubble_);
 
   // Instruct the service to delete the snapshot file.
   service_->DeleteSnapshot(snapshot_path_);
 
-  // Restore the resting state mobile device icon.
-  gtk_image_set_from_pixbuf(GTK_IMAGE(anchor_image_),
-      theme_service_->GetImageNamed(IDR_MOBILE)->ToGdkPixbuf());
+  // TODO(msw): Restore the resting state action box icon.
 
   labels_.clear();
-  anchor_image_ = NULL;
+  anchor_widget_ = NULL;
   send_copy_ = NULL;
   cancel_ = NULL;
   send_ = NULL;
   error_ = NULL;
   bubble_ = NULL;
   progress_animation_.reset();
 }
 
 void ChromeToMobileBubbleGtk::AnimationProgressed(
     const ui::Animation* animation) {
@@ skipping 50 matching lines @@
         base::Bind(&ChromeToMobileBubbleGtk::OnCancelClicked,
                    weak_ptr_factory_.GetWeakPtr(), GTK_WIDGET(NULL)),
         base::TimeDelta::FromSeconds(kAutoCloseDelay));
   } else {
     gtk_button_set_label(GTK_BUTTON(send_),
         l10n_util::GetStringUTF8(IDS_CHROME_TO_MOBILE_BUBBLE_ERROR).c_str());
     gtk_widget_set_visible(error_, TRUE);
   }
 }
 
-ChromeToMobileBubbleGtk::ChromeToMobileBubbleGtk(GtkImage* anchor_image,
+ChromeToMobileBubbleGtk::ChromeToMobileBubbleGtk(GtkWidget* anchor_widget,
                                                  Browser* browser)
     : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       browser_(browser),
       service_(ChromeToMobileServiceFactory::GetForProfile(browser->profile())),
       theme_service_(GtkThemeService::GetFrom(browser->profile())),
-      anchor_image_(anchor_image),
+      anchor_widget_(anchor_widget),
       send_copy_(NULL),
       cancel_(NULL),
       send_(NULL),
       error_(NULL),
       bubble_(NULL) {
   DCHECK(service_->HasMobiles());
   service_->LogMetric(ChromeToMobileService::BUBBLE_SHOWN);
 
   // Generate the MHTML snapshot now to report its size in the bubble.
   service_->GenerateSnapshot(browser_, weak_ptr_factory_.GetWeakPtr());
@@ skipping 85 matching lines @@
   gtk_misc_set_alignment(GTK_MISC(error_), 0, 1);
   gtk_util::SetLabelColor(error_, &kErrorColor);
   gtk_box_pack_start(GTK_BOX(content), error_, FALSE, FALSE, 0);
   gtk_widget_set_no_show_all(error_, TRUE);
 
   // Initialize focus to the send button.
   gtk_container_set_focus_child(GTK_CONTAINER(content), send_);
 
   BubbleGtk::ArrowLocationGtk arrow_location = base::i18n::IsRTL() ?
       BubbleGtk::ARROW_LOCATION_TOP_LEFT : BubbleGtk::ARROW_LOCATION_TOP_RIGHT;
-  bubble_ = BubbleGtk::Show(GTK_WIDGET(anchor_image_),
-                            NULL,
-                            content,
-                            arrow_location,
-                            BubbleGtk::MATCH_SYSTEM_THEME |
-                                BubbleGtk::POPUP_WINDOW |
-                                BubbleGtk::GRAB_INPUT,
-                            theme_service_,
-                            this /*delegate*/);
+  const int attribute_flags = BubbleGtk::MATCH_SYSTEM_THEME |
+                              BubbleGtk::POPUP_WINDOW | BubbleGtk::GRAB_INPUT;
+  bubble_ = BubbleGtk::Show(anchor_widget_, NULL, content, arrow_location,
+                            attribute_flags, theme_service_, this /*delegate*/);
   if (!bubble_) {
     NOTREACHED();
     return;
   }
 
   g_signal_connect(content, "destroy", G_CALLBACK(&OnDestroyThunk), this);
   g_signal_connect(learn_, "clicked", G_CALLBACK(&OnLearnClickedThunk), this);
   g_signal_connect(cancel_, "clicked", G_CALLBACK(&OnCancelClickedThunk), this);
   g_signal_connect(send_, "clicked", G_CALLBACK(&OnSendClickedThunk), this);
 
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(theme_service_));
   theme_service_->InitThemesFor(this);
 
-  gtk_image_set_from_pixbuf(GTK_IMAGE(anchor_image_),
-      theme_service_->GetImageNamed(IDR_MOBILE_LIT)->ToGdkPixbuf());
+  // TODO(msw): Show the lit mobile device icon during the bubble's lifetime.

[Evan Stade, 2012/09/10 17:10:56]

don't need two copies of this todo

[msw, 2012/09/10 18:03:48]

Done.

 }
 
 ChromeToMobileBubbleGtk::~ChromeToMobileBubbleGtk() {
   DCHECK(g_bubble);
   g_bubble = NULL;
 }
 
 void ChromeToMobileBubbleGtk::OnDestroy(GtkWidget* widget) {
   // We are self deleting, we have a destroy signal setup to catch when we
   // destroyed (via the BubbleGtk being destroyed), and delete ourself.
@@ skipping 35 matching lines @@
   }
 
   // Update the view's contents to show the "Sending..." progress animation.
   gtk_widget_set_sensitive(cancel_, FALSE);
   gtk_widget_set_sensitive(send_, FALSE);
   gtk_button_set_alignment(GTK_BUTTON(send_), 0, 0.5);
   progress_animation_.reset(new ui::ThrobAnimation(this));
   progress_animation_->SetDuration(kProgressThrobDurationMS);
   progress_animation_->StartThrobbing(-1);
 }